Skip to content

Commit 657623e

Browse files
committed
changes
1 parent 17e6fda commit 657623e

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

src/rbc/bids/longitudinal.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import TYPE_CHECKING
5+
from typing import TYPE_CHECKING, TypedDict
66

77
from rbc.bids import Suffix, bids_safe_label
88

@@ -100,6 +100,18 @@ def export_longitudinal_anat(aex: Bids, outputs: AnatomicalLongOutputs) -> None:
100100
)
101101

102102

103+
class LongitudinalFuncInputs(TypedDict):
104+
"""Resolved inputs for the longitudinal functional workflow."""
105+
106+
template: Path
107+
anat_to_template_xfm: Path
108+
bold_to_anat_itk: Path
109+
sbref: Path
110+
bold: Path
111+
bold_mask: Path
112+
regressor_files: dict[str, Path]
113+
114+
103115
def resolve_longitudinal_func(
104116
func_q: Bids,
105117
tpl_q: Bids,
@@ -108,7 +120,7 @@ def resolve_longitudinal_func(
108120
*,
109121
ses: str,
110122
regressors: Sequence[str],
111-
) -> dict[str, Path | None | dict[str, Path]]:
123+
) -> LongitudinalFuncInputs:
112124
"""Resolve inputs for longitudinal functional processing.
113125
114126
Args:

src/rbc/cli/longitudinal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def validate_namespace(cls, ns: argparse.Namespace) -> LongitudinalArgs:
4646
def main(args: LongitudinalArgs) -> int:
4747
"""Main entrypoint of longitudinal workflow."""
4848
run(
49-
input_dirs=list(args.input_dirs),
49+
input_dirs=args.input_dirs,
5050
output_dir=args.output_dir,
5151
filters=Filters(
5252
participant_label=args.participant_label,

src/rbc/orchestration/longitudinal.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
load_table,
1818
)
1919
from rbc.bids.longitudinal import (
20+
LongitudinalFuncInputs,
2021
export_longitudinal_anat,
2122
export_longitudinal_func,
2223
resolve_longitudinal_anat,
@@ -91,7 +92,7 @@ def process_func(
9192
func_q = pipe_ctx.bids(datatype=Datatype.FUNC, entities=ents)
9293
tpl_q = pipe_ctx.bids(datatype=Datatype.ANAT).derive(ses="longitudinal")
9394

94-
resolved = resolve_longitudinal_func(
95+
resolved: LongitudinalFuncInputs = resolve_longitudinal_func(
9596
func_q,
9697
tpl_q,
9798
func_df,
@@ -105,7 +106,7 @@ def process_func(
105106

106107

107108
def run(
108-
input_dirs: list[Path],
109+
input_dirs: Sequence[Path],
109110
output_dir: Path,
110111
*,
111112
filters: Filters,

0 commit comments

Comments
 (0)