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

niwrap_freesurfer/freesurfer/labels_disjoint.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 LABELS_DISJOINT_METADATA = Metadata(
-    id="b496ffd6d7aa4a8f3534391ff07d8324297f776c.boutiques",
+    id="86418874c210febfd9899f1bd03f4fd4b41547fb.boutiques",
     name="labels_disjoint",
     package="freesurfer",
     container_image_tag="freesurfer/freesurfer:7.4.1",
@@ -14,48 +14,22 @@ LABELS_DISJOINT_METADATA = Metadata(
 
 
 LabelsDisjointParameters = typing.TypedDict('LabelsDisjointParameters', {
-    "__STYXTYPE__": typing.Literal["labels_disjoint"],
+    "@type": typing.NotRequired[typing.Literal["freesurfer/labels_disjoint"]],
+    "label1": InputPathType,
+    "label2": InputPathType,
+    "outputname": str,
+})
+LabelsDisjointParametersTagged = typing.TypedDict('LabelsDisjointParametersTagged', {
+    "@type": typing.Literal["freesurfer/labels_disjoint"],
     "label1": InputPathType,
     "label2": InputPathType,
     "outputname": str,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "labels_disjoint": labels_disjoint_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 {
-        "labels_disjoint": labels_disjoint_outputs,
-    }.get(t)
 
 
 class LabelsDisjointOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `labels_disjoint(...)`.
+    Output object returned when calling `LabelsDisjointParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -67,7 +41,7 @@ def labels_disjoint_params(
     label1: InputPathType,
     label2: InputPathType,
     outputname: str,
-) -> LabelsDisjointParameters:
+) -> LabelsDisjointParametersTagged:
     """
     Build parameters.
     
@@ -81,7 +55,7 @@ def labels_disjoint_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "labels_disjoint",
+        "@type": "freesurfer/labels_disjoint",
         "label1": label1,
         "label2": label2,
         "outputname": outputname,
@@ -104,9 +78,9 @@ def labels_disjoint_cargs(
     """
     cargs = []
     cargs.append("labels_disjoint")
-    cargs.append(execution.input_file(params.get("label1")))
-    cargs.append(execution.input_file(params.get("label2")))
-    cargs.append(params.get("outputname"))
+    cargs.append(execution.input_file(params.get("label1", None)))
+    cargs.append(execution.input_file(params.get("label2", None)))
+    cargs.append(params.get("outputname", None))
     return cargs
 
 
@@ -125,16 +99,18 @@ def labels_disjoint_outputs(
     """
     ret = LabelsDisjointOutputs(
         root=execution.output_file("."),
-        output_file=execution.output_file(params.get("outputname")),
+        output_file=execution.output_file(params.get("outputname", None)),
     )
     return ret
 
 
 def labels_disjoint_execute(
     params: LabelsDisjointParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> LabelsDisjointOutputs:
     """
+    labels_disjoint
+    
     Subtracts one label file from another, effectively creating a label that
     represents label1 minus label2.
     
@@ -144,10 +120,12 @@ def labels_disjoint_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `LabelsDisjointOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(LABELS_DISJOINT_METADATA)
     params = execution.params(params)
     cargs = labels_disjoint_cargs(params, execution)
     ret = labels_disjoint_outputs(params, execution)
@@ -162,6 +140,8 @@ def labels_disjoint(
     runner: Runner | None = None,
 ) -> LabelsDisjointOutputs:
     """
+    labels_disjoint
+    
     Subtracts one label file from another, effectively creating a label that
     represents label1 minus label2.
     
@@ -179,20 +159,18 @@ def labels_disjoint(
     Returns:
         NamedTuple of outputs (described in `LabelsDisjointOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(LABELS_DISJOINT_METADATA)
     params = labels_disjoint_params(
         label1=label1,
         label2=label2,
         outputname=outputname,
     )
-    return labels_disjoint_execute(params, execution)
+    return labels_disjoint_execute(params, runner)
 
 
 __all__ = [
     "LABELS_DISJOINT_METADATA",
     "LabelsDisjointOutputs",
-    "LabelsDisjointParameters",
     "labels_disjoint",
+    "labels_disjoint_execute",
     "labels_disjoint_params",
 ]

niwrap_freesurfer/freesurfer/labels_intersect.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 LABELS_INTERSECT_METADATA = Metadata(
-    id="983785cc757edbd08493db2a0f88b60b6b753bcf.boutiques",
+    id="5d639bbfd162e906e9059ca104ed147ca988037e.boutiques",
     name="labels_intersect",
     package="freesurfer",
     container_image_tag="freesurfer/freesurfer:7.4.1",
@@ -14,48 +14,22 @@ LABELS_INTERSECT_METADATA = Metadata(
 
 
 LabelsIntersectParameters = typing.TypedDict('LabelsIntersectParameters', {
-    "__STYXTYPE__": typing.Literal["labels_intersect"],
+    "@type": typing.NotRequired[typing.Literal["freesurfer/labels_intersect"]],
+    "label1": InputPathType,
+    "label2": InputPathType,
+    "outputname": str,
+})
+LabelsIntersectParametersTagged = typing.TypedDict('LabelsIntersectParametersTagged', {
+    "@type": typing.Literal["freesurfer/labels_intersect"],
     "label1": InputPathType,
     "label2": InputPathType,
     "outputname": str,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "labels_intersect": labels_intersect_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 {
-        "labels_intersect": labels_intersect_outputs,
-    }.get(t)
 
 
 class LabelsIntersectOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `labels_intersect(...)`.
+    Output object returned when calling `LabelsIntersectParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -67,7 +41,7 @@ def labels_intersect_params(
     label1: InputPathType,
     label2: InputPathType,
     outputname: str,
-) -> LabelsIntersectParameters:
+) -> LabelsIntersectParametersTagged:
     """
     Build parameters.
     
@@ -79,7 +53,7 @@ def labels_intersect_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "labels_intersect",
+        "@type": "freesurfer/labels_intersect",
         "label1": label1,
         "label2": label2,
         "outputname": outputname,
@@ -102,9 +76,9 @@ def labels_intersect_cargs(
     """
     cargs = []
     cargs.append("labels_intersect")
-    cargs.append(execution.input_file(params.get("label1")))
-    cargs.append(execution.input_file(params.get("label2")))
-    cargs.append(params.get("outputname"))
+    cargs.append(execution.input_file(params.get("label1", None)))
+    cargs.append(execution.input_file(params.get("label2", None)))
+    cargs.append(params.get("outputname", None))
     return cargs
 
 
@@ -123,16 +97,18 @@ def labels_intersect_outputs(
     """
     ret = LabelsIntersectOutputs(
         root=execution.output_file("."),
-        output_label=execution.output_file(params.get("outputname")),
+        output_label=execution.output_file(params.get("outputname", None)),
     )
     return ret
 
 
 def labels_intersect_execute(
     params: LabelsIntersectParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> LabelsIntersectOutputs:
     """
+    labels_intersect
+    
     Tool to find the intersection of two label files.
     
     Author: FreeSurfer Developers
@@ -141,10 +117,12 @@ def labels_intersect_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `LabelsIntersectOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(LABELS_INTERSECT_METADATA)
     params = execution.params(params)
     cargs = labels_intersect_cargs(params, execution)
     ret = labels_intersect_outputs(params, execution)
@@ -159,6 +137,8 @@ def labels_intersect(
     runner: Runner | None = None,
 ) -> LabelsIntersectOutputs:
     """
+    labels_intersect
+    
     Tool to find the intersection of two label files.
     
     Author: FreeSurfer Developers
@@ -173,20 +153,18 @@ def labels_intersect(
     Returns:
         NamedTuple of outputs (described in `LabelsIntersectOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(LABELS_INTERSECT_METADATA)
     params = labels_intersect_params(
         label1=label1,
         label2=label2,
         outputname=outputname,
     )
-    return labels_intersect_execute(params, execution)
+    return labels_intersect_execute(params, runner)
 
 
 __all__ = [
     "LABELS_INTERSECT_METADATA",
     "LabelsIntersectOutputs",
-    "LabelsIntersectParameters",
     "labels_intersect",
+    "labels_intersect_execute",
     "labels_intersect_params",
 ]

niwrap_freesurfer/freesurfer/labels_union.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 LABELS_UNION_METADATA = Metadata(
-    id="31af3a14a7e9b9db29234914f8b77ce6c20e7f2e.boutiques",
+    id="b44e8d83fe5c484f4ce13970588ad7b0338e650f.boutiques",
     name="labels_union",
     package="freesurfer",
     container_image_tag="freesurfer/freesurfer:7.4.1",
@@ -14,48 +14,22 @@ LABELS_UNION_METADATA = Metadata(
 
 
 LabelsUnionParameters = typing.TypedDict('LabelsUnionParameters', {
-    "__STYXTYPE__": typing.Literal["labels_union"],
+    "@type": typing.NotRequired[typing.Literal["freesurfer/labels_union"]],
+    "label1": InputPathType,
+    "label2": InputPathType,
+    "outputname": str,
+})
+LabelsUnionParametersTagged = typing.TypedDict('LabelsUnionParametersTagged', {
+    "@type": typing.Literal["freesurfer/labels_union"],
     "label1": InputPathType,
     "label2": InputPathType,
     "outputname": str,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "labels_union": labels_union_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 {
-        "labels_union": labels_union_outputs,
-    }.get(t)
 
 
 class LabelsUnionOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `labels_union(...)`.
+    Output object returned when calling `LabelsUnionParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -67,7 +41,7 @@ def labels_union_params(
     label1: InputPathType,
     label2: InputPathType,
     outputname: str,
-) -> LabelsUnionParameters:
+) -> LabelsUnionParametersTagged:
     """
     Build parameters.
     
@@ -80,7 +54,7 @@ def labels_union_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "labels_union",
+        "@type": "freesurfer/labels_union",
         "label1": label1,
         "label2": label2,
         "outputname": outputname,
@@ -103,9 +77,9 @@ def labels_union_cargs(
     """
     cargs = []
     cargs.append("labels_union")
-    cargs.append(execution.input_file(params.get("label1")))
-    cargs.append(execution.input_file(params.get("label2")))
-    cargs.append(params.get("outputname"))
+    cargs.append(execution.input_file(params.get("label1", None)))
+    cargs.append(execution.input_file(params.get("label2", None)))
+    cargs.append(params.get("outputname", None))
     return cargs
 
 
@@ -124,16 +98,18 @@ def labels_union_outputs(
     """
     ret = LabelsUnionOutputs(
         root=execution.output_file("."),
-        union_label=execution.output_file(params.get("outputname")),
+        union_label=execution.output_file(params.get("outputname", None)),
     )
     return ret
 
 
 def labels_union_execute(
     params: LabelsUnionParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> LabelsUnionOutputs:
     """
+    labels_union
+    
     Utility to create the union of two label files.
     
     Author: FreeSurfer Developers
@@ -142,10 +118,12 @@ def labels_union_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `LabelsUnionOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(LABELS_UNION_METADATA)
     params = execution.params(params)
     cargs = labels_union_cargs(params, execution)
     ret = labels_union_outputs(params, execution)
@@ -160,6 +138,8 @@ def labels_union(
     runner: Runner | None = None,
 ) -> LabelsUnionOutputs:
     """
+    labels_union
+    
     Utility to create the union of two label files.
     
     Author: FreeSurfer Developers
@@ -175,20 +155,18 @@ def labels_union(
     Returns:
         NamedTuple of outputs (described in `LabelsUnionOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(LABELS_UNION_METADATA)
     params = labels_union_params(
         label1=label1,
         label2=label2,
         outputname=outputname,
     )
-    return labels_union_execute(params, execution)
+    return labels_union_execute(params, runner)
 
 
 __all__ = [
     "LABELS_UNION_METADATA",
     "LabelsUnionOutputs",
-    "LabelsUnionParameters",
     "labels_union",
+    "labels_union_execute",
     "labels_union_params",
 ]

niwrap_freesurfer/freesurfer/list_otl_labels.py

@@ -6,7 +6,7 @@ import pathlib
 from styxdefs import *
 
 LIST_OTL_LABELS_METADATA = Metadata(
-    id="bd7fd10424a3f1c598cf12650090350577b5ac40.boutiques",
+    id="859a8dfc62a45a6e9d9a78823fda063b71532ae7.boutiques",
     name="list_otl_labels",
     package="freesurfer",
     container_image_tag="freesurfer/freesurfer:7.4.1",
@@ -14,45 +14,18 @@ LIST_OTL_LABELS_METADATA = Metadata(
 
 
 ListOtlLabelsParameters = typing.TypedDict('ListOtlLabelsParameters', {
-    "__STYXTYPE__": typing.Literal["list_otl_labels"],
+    "@type": typing.NotRequired[typing.Literal["freesurfer/list_otl_labels"]],
+    "input_file": InputPathType,
+})
+ListOtlLabelsParametersTagged = typing.TypedDict('ListOtlLabelsParametersTagged', {
+    "@type": typing.Literal["freesurfer/list_otl_labels"],
     "input_file": InputPathType,
 })
-
-
-def dyn_cargs(
-    t: str,
-) -> typing.Any:
-    """
-    Get build cargs function by command type.
-    
-    Args:
-        t: Command type.
-    Returns:
-        Build cargs function.
-    """
-    return {
-        "list_otl_labels": list_otl_labels_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 ListOtlLabelsOutputs(typing.NamedTuple):
     """
-    Output object returned when calling `list_otl_labels(...)`.
+    Output object returned when calling `ListOtlLabelsParameters(...)`.
     """
     root: OutputPathType
     """Output root folder. This is the root folder for all outputs."""
@@ -60,7 +33,7 @@ class ListOtlLabelsOutputs(typing.NamedTuple):
 
 def list_otl_labels_params(
     input_file: InputPathType,
-) -> ListOtlLabelsParameters:
+) -> ListOtlLabelsParametersTagged:
     """
     Build parameters.
     
@@ -70,7 +43,7 @@ def list_otl_labels_params(
         Parameter dictionary
     """
     params = {
-        "__STYXTYPE__": "list_otl_labels",
+        "@type": "freesurfer/list_otl_labels",
         "input_file": input_file,
     }
     return params
@@ -93,7 +66,7 @@ def list_otl_labels_cargs(
     cargs.append("list_otl_labels")
     cargs.extend([
         "-i",
-        execution.input_file(params.get("input_file"))
+        execution.input_file(params.get("input_file", None))
     ])
     return cargs
 
@@ -119,9 +92,11 @@ def list_otl_labels_outputs(
 
 def list_otl_labels_execute(
     params: ListOtlLabelsParameters,
-    execution: Execution,
+    runner: Runner | None = None,
 ) -> ListOtlLabelsOutputs:
     """
+    list_otl_labels
+    
     Tool for listing labels in an imaging file.
     
     Author: FreeSurfer Developers
@@ -130,10 +105,12 @@ def list_otl_labels_execute(
     
     Args:
         params: The parameters.
-        execution: The execution object.
+        runner: Command runner.
     Returns:
         NamedTuple of outputs (described in `ListOtlLabelsOutputs`).
     """
+    runner = runner or get_global_runner()
+    execution = runner.start_execution(LIST_OTL_LABELS_METADATA)
     params = execution.params(params)
     cargs = list_otl_labels_cargs(params, execution)
     ret = list_otl_labels_outputs(params, execution)
@@ -146,6 +123,8 @@ def list_otl_labels(
     runner: Runner | None = None,
 ) -> ListOtlLabelsOutputs:
     """
+    list_otl_labels
+    
     Tool for listing labels in an imaging file.
     
     Author: FreeSurfer Developers
@@ -158,18 +137,16 @@ def list_otl_labels(
     Returns:
         NamedTuple of outputs (described in `ListOtlLabelsOutputs`).
     """
-    runner = runner or get_global_runner()
-    execution = runner.start_execution(LIST_OTL_LABELS_METADATA)
     params = list_otl_labels_params(
         input_file=input_file,
     )
-    return list_otl_labels_execute(params, execution)
+    return list_otl_labels_execute(params, runner)
 
 
 __all__ = [
     "LIST_OTL_LABELS_METADATA",
     "ListOtlLabelsOutputs",
-    "ListOtlLabelsParameters",
     "list_otl_labels",
+    "list_otl_labels_execute",
     "list_otl_labels_params",
 ]