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

niwrap_afni/afni/v_1d_upsample.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1D_UPSAMPLE_METADATA = Metadata(
-    id="3df755faa433b3cc1a6abb13d23619f453b714fd.boutiques",
+    id="6b2751f014ec84a7cd837f2437b3b83a54a8dc73.boutiques",
     name="1dUpsample",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,48 +14,22 @@ V_1D_UPSAMPLE_METADATA = Metadata(
 
 
 V1dUpsampleParameters = typing.TypedDict('V1dUpsampleParameters', {
-    "__STYXTYPE__": typing.Literal["1dUpsample"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dUpsample"]],
+    "upsample_factor": float,
+    "input_file": InputPathType,
+    "linear_interpolation": bool,
+})
+V1dUpsampleParametersTagged = typing.TypedDict('V1dUpsampleParametersTagged', {
+    "@type": typing.Literal["afni/1dUpsample"],
     "upsample_factor": float,
     "input_file": InputPathType,
     "linear_interpolation": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dUpsample": v_1d_upsample_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 {
-        "1dUpsample": v_1d_upsample_outputs,
-    }.get(t)
 
 
 class V1dUpsampleOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1d_upsample(...)`.
+    Output object returned when calling `V1dUpsampleParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -67,7 +41,7 @@ def v_1d_upsample_params(
     upsample_factor: float,
     input_file: InputPathType,
     linear_interpolation: bool = False,
-) -> V1dUpsampleParameters:
+) -> V1dUpsampleParametersTagged:
     """
     Build parameters.
     
@@ -80,7 +54,7 @@ def v_1d_upsample_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dUpsample",
+        "@type": "afni/1dUpsample",
         "upsample_factor": upsample_factor,
         "input_file": input_file,
         "linear_interpolation": linear_interpolation,
@@ -103,9 +77,9 @@ def v_1d_upsample_cargs(
     """
     cargs = []
     cargs.append("1dUpsample")
-    cargs.append(str(params.get("upsample_factor")))
-    cargs.append(execution.input_file(params.get("input_file")))
-    if params.get("linear_interpolation"):
+    cargs.append(str(params.get("upsample_factor", None)))
+    cargs.append(execution.input_file(params.get("input_file", None)))
+    if params.get("linear_interpolation", False):
         cargs.append("-one")
     return cargs
 
@@ -132,9 +106,11 @@ def v_1d_upsample_outputs(
 
 def v_1d_upsample_execute(
     params: V1dUpsampleParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dUpsampleOutputs:
     """
+    1dUpsample
+    
     Upsamples a 1D time series to a finer time grid.
     
     Author: AFNI Developers
@@ -143,10 +119,12 @@ def v_1d_upsample_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dUpsampleOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1D_UPSAMPLE_METADATA)
     params = execution.params(params)
     cargs = v_1d_upsample_cargs(params, execution)
     ret = v_1d_upsample_outputs(params, execution)
@@ -161,6 +139,8 @@ def v_1d_upsample(
     runner: Runner | None = None,
 ) -> V1dUpsampleOutputs:
     """
+    1dUpsample
+    
     Upsamples a 1D time series to a finer time grid.
     
     Author: AFNI Developers
@@ -176,20 +156,18 @@ def v_1d_upsample(
     Returns:
         NamedTuple of outputs (described in `V1dUpsampleOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1D_UPSAMPLE_METADATA)
     params = v_1d_upsample_params(
         upsample_factor=upsample_factor,
         input_file=input_file,
         linear_interpolation=linear_interpolation,
     )
-    return v_1d_upsample_execute(params, execution)
+    return v_1d_upsample_execute(params, runner)
 
 
 __all__ = [
     "V1dUpsampleOutputs",
-    "V1dUpsampleParameters",
     "V_1D_UPSAMPLE_METADATA",
     "v_1d_upsample",
+    "v_1d_upsample_execute",
     "v_1d_upsample_params",
 ]

niwrap_afni/afni/v_1dcat.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DCAT_METADATA = Metadata(
-    id="7a75008a7404e18d956b9ec2f61292d84973e4dc.boutiques",
+    id="d5f06271d13f8fe77a286910bcbb6e690805b779.boutiques",
     name="1dcat",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,19 @@ V_1DCAT_METADATA = Metadata(
 
 
 V1dcatParameters = typing.TypedDict('V1dcatParameters', {
-    "__STYXTYPE__": typing.Literal["1dcat"],
+    "@type": typing.NotRequired[typing.Literal["afni/1dcat"]],
+    "input_files": list[InputPathType],
+    "tsv_output": bool,
+    "csv_output": bool,
+    "nonconst_output": bool,
+    "nonfixed_output": bool,
+    "number_format": typing.NotRequired[str | None],
+    "stack_output": bool,
+    "column_row_selection": typing.NotRequired[str | None],
+    "ok_empty": bool,
+})
+V1dcatParametersTagged = typing.TypedDict('V1dcatParametersTagged', {
+    "@type": typing.Literal["afni/1dcat"],
     "input_files": list[InputPathType],
     "tsv_output": bool,
     "csv_output": bool,
@@ -25,43 +37,11 @@ V1dcatParameters = typing.TypedDict('V1dcatParameters', {
     "column_row_selection": typing.NotRequired[str | None],
     "ok_empty": bool,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1dcat": v_1dcat_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 {
-        "1dcat": v_1dcat_outputs,
-    }.get(t)
 
 
 class V1dcatOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1dcat(...)`.
+    Output object returned when calling `V1dcatParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -79,7 +59,7 @@ def v_1dcat_params(
     stack_output: bool = False,
     column_row_selection: str | None = None,
     ok_empty: bool = False,
-) -> V1dcatParameters:
+) -> V1dcatParametersTagged:
     """
     Build parameters.
     
@@ -102,7 +82,7 @@ def v_1dcat_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1dcat",
+        "@type": "afni/1dcat",
         "input_files": input_files,
         "tsv_output": tsv_output,
         "csv_output": csv_output,
@@ -133,28 +113,28 @@ def v_1dcat_cargs(
     """
     cargs = []
     cargs.append("1dcat")
-    cargs.extend([execution.input_file(f) for f in params.get("input_files")])
-    if params.get("tsv_output"):
+    cargs.extend([execution.input_file(f) for f in params.get("input_files", None)])
+    if params.get("tsv_output", False):
         cargs.append("-tsvout")
-    if params.get("csv_output"):
+    if params.get("csv_output", False):
         cargs.append("-csvout")
-    if params.get("nonconst_output"):
+    if params.get("nonconst_output", False):
         cargs.append("-nonconst")
-    if params.get("nonfixed_output"):
+    if params.get("nonfixed_output", False):
         cargs.append("-nonfixed")
-    if params.get("number_format") is not None:
+    if params.get("number_format", None) is not None:
         cargs.extend([
             "-form",
-            params.get("number_format")
+            params.get("number_format", None)
         ])
-    if params.get("stack_output"):
+    if params.get("stack_output", False):
         cargs.append("-stack")
-    if params.get("column_row_selection") is not None:
+    if params.get("column_row_selection", None) is not None:
         cargs.extend([
             "-sel",
-            params.get("column_row_selection")
+            params.get("column_row_selection", None)
         ])
-    if params.get("ok_empty"):
+    if params.get("ok_empty", False):
         cargs.append("-OKempty")
     return cargs
 
@@ -181,9 +161,11 @@ def v_1dcat_outputs(
 
 def v_1dcat_execute(
     params: V1dcatParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1dcatOutputs:
     """
+    1dcat
+    
     Concatenates columns of multiple 1D or TSV/CSV files.
     
     Author: AFNI Developers
@@ -192,10 +174,12 @@ def v_1dcat_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1dcatOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DCAT_METADATA)
     params = execution.params(params)
     cargs = v_1dcat_cargs(params, execution)
     ret = v_1dcat_outputs(params, execution)
@@ -216,6 +200,8 @@ def v_1dcat(
     runner: Runner | None = None,
 ) -> V1dcatOutputs:
     """
+    1dcat
+    
     Concatenates columns of multiple 1D or TSV/CSV files.
     
     Author: AFNI Developers
@@ -241,8 +227,6 @@ def v_1dcat(
     Returns:
         NamedTuple of outputs (described in `V1dcatOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DCAT_METADATA)
     params = v_1dcat_params(
         input_files=input_files,
         tsv_output=tsv_output,
@@ -254,13 +238,13 @@ def v_1dcat(
         column_row_selection=column_row_selection,
         ok_empty=ok_empty,
     )
-    return v_1dcat_execute(params, execution)
+    return v_1dcat_execute(params, runner)
 
 
 __all__ = [
     "V1dcatOutputs",
-    "V1dcatParameters",
     "V_1DCAT_METADATA",
     "v_1dcat",
+    "v_1dcat_execute",
     "v_1dcat_params",
 ]

niwrap_afni/afni/v_1ddot.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 V_1DDOT_METADATA = Metadata(
-    id="78349c7b966df3a5026a4b202c3de358faef8d17.boutiques",
+    id="1a194bfd52a12202c97a4c5965254532ca81eeaf.boutiques",
     name="1ddot",
     package="afni",
     container_image_tag="afni/afni_make_build:AFNI_24.2.06",
@@ -14,7 +14,18 @@ V_1DDOT_METADATA = Metadata(
 
 
 V1ddotParameters = typing.TypedDict('V1ddotParameters', {
-    "__STYXTYPE__": typing.Literal["1ddot"],
+    "@type": typing.NotRequired[typing.Literal["afni/1ddot"]],
+    "one_flag": bool,
+    "dem_flag": bool,
+    "cov_flag": bool,
+    "inn_flag": bool,
+    "rank_flag": bool,
+    "terse_flag": bool,
+    "okzero_flag": bool,
+    "input_files": list[InputPathType],
+})
+V1ddotParametersTagged = typing.TypedDict('V1ddotParametersTagged', {
+    "@type": typing.Literal["afni/1ddot"],
     "one_flag": bool,
     "dem_flag": bool,
     "cov_flag": bool,
@@ -24,43 +35,11 @@ V1ddotParameters = typing.TypedDict('V1ddotParameters', {
     "okzero_flag": bool,
     "input_files": list[InputPathType],
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "1ddot": v_1ddot_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 {
-        "1ddot": v_1ddot_outputs,
-    }.get(t)
 
 
 class V1ddotOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `v_1ddot(...)`.
+    Output object returned when calling `V1ddotParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -79,7 +58,7 @@ def v_1ddot_params(
     rank_flag: bool = False,
     terse_flag: bool = False,
     okzero_flag: bool = False,
-) -> V1ddotParameters:
+) -> V1ddotParametersTagged:
     """
     Build parameters.
     
@@ -99,7 +78,7 @@ def v_1ddot_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "1ddot",
+        "@type": "afni/1ddot",
         "one_flag": one_flag,
         "dem_flag": dem_flag,
         "cov_flag": cov_flag,
@@ -127,21 +106,21 @@ def v_1ddot_cargs(
     """
     cargs = []
     cargs.append("1ddot")
-    if params.get("one_flag"):
+    if params.get("one_flag", False):
         cargs.append("-one")
-    if params.get("dem_flag"):
+    if params.get("dem_flag", False):
         cargs.append("-dem")
-    if params.get("cov_flag"):
+    if params.get("cov_flag", False):
         cargs.append("-cov")
-    if params.get("inn_flag"):
+    if params.get("inn_flag", False):
         cargs.append("-inn")
-    if params.get("rank_flag"):
+    if params.get("rank_flag", False):
         cargs.append("-rank")
-    if params.get("terse_flag"):
+    if params.get("terse_flag", False):
         cargs.append("-terse")
-    if params.get("okzero_flag"):
+    if params.get("okzero_flag", False):
         cargs.append("-okzero")
-    cargs.extend([execution.input_file(f) for f in params.get("input_files")])
+    cargs.extend([execution.input_file(f) for f in params.get("input_files", None)])
     return cargs
 
 
@@ -168,9 +147,11 @@ def v_1ddot_outputs(
 
 def v_1ddot_execute(
     params: V1ddotParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> V1ddotOutputs:
     """
+    1ddot
+    
     Computes the correlation matrix of the input 1D files and their inverse
     correlation matrix.
     
@@ -180,10 +161,12 @@ def v_1ddot_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `V1ddotOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(V_1DDOT_METADATA)
     params = execution.params(params)
     cargs = v_1ddot_cargs(params, execution)
     ret = v_1ddot_outputs(params, execution)
@@ -203,6 +186,8 @@ def v_1ddot(
     runner: Runner | None = None,
 ) -> V1ddotOutputs:
     """
+    1ddot
+    
     Computes the correlation matrix of the input 1D files and their inverse
     correlation matrix.
     
@@ -226,8 +211,6 @@ def v_1ddot(
     Returns:
         NamedTuple of outputs (described in `V1ddotOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(V_1DDOT_METADATA)
     params = v_1ddot_params(
         one_flag=one_flag,
         dem_flag=dem_flag,
@@ -238,13 +221,13 @@ def v_1ddot(
         okzero_flag=okzero_flag,
         input_files=input_files,
     )
-    return v_1ddot_execute(params, execution)
+    return v_1ddot_execute(params, runner)
 
 
 __all__ = [
     "V1ddotOutputs",
-    "V1ddotParameters",
     "V_1DDOT_METADATA",
     "v_1ddot",
+    "v_1ddot_execute",
     "v_1ddot_params",
 ]