-
Notifications
You must be signed in to change notification settings - Fork 296
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ENH: Use BIDS URIs to track Sources in sidecars #3255
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3255 +/- ##
==========================================
+ Coverage 73.24% 73.60% +0.36%
==========================================
Files 54 56 +2
Lines 4164 4240 +76
==========================================
+ Hits 3050 3121 +71
- Misses 1114 1119 +5 ☔ View full report in Codecov by Sentry. |
I'm stumped. I can't figure out why |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hey @tsalo - took a quick look through to try to help get you unstuck
Co-authored-by: Mathias Goncalves <[email protected]>
It's working! Thanks @mgxd! I have a few ideas for next steps:
|
I have the unit test implemented, as well as a more flexible BIDSURI class. I think tracking immediate source files should happen in a future PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, looks pretty good - just one question on the BIDURI implementation
From the artifacts, {
"Sources": [
"/scratch/fmriprep_24_0_wf/sub_01_wf/bold_task_mixedgamblestask_run_01_wf/bold_fit_wf/hmc_boldref_wf/gen_avg/sub-01_task-mixedgamblestask_run-01_bold_average.nii.gz"
]
} Possibly we were already screwing this up, but this seems worth fixing. |
@effigies I took a crack at it. I'll fix any bugs that come up in the CI. |
Aha!
|
One last one: sub-02/func/sub-02_task-cuedSGT_run-01_desc-brain_mask.json {
"Sources": [
"bids:raw:sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_bold.nii.gz",
"bids:raw:sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_bold.nii.gz",
"bids:raw:sub-02/func/sub-02_task-cuedSGT_run-01_echo-3_bold.nii.gz",
"/scratch/fmriprep_24_0_wf/sub_02_wf/bold_task_cuedSGT_run_01_echo_1_wf/bold_fit_wf/bold_hmc_wf/fsl2itk/mat2itk.txt",
"bids::sub-02/func/sub-02_task-cuedSGT_run-01_from-boldref_to-auto00000_mode-image_xfm.txt"
]
} |
This is awesome. Thanks so much for taking the time to work on this. |
I can't figure out what's going on with ds005. It's failing but I'm not seeing any crash files in the artifacts. |
Fun:
Let's hope this is just a weird one-off. Rerunning. |
I think the error is actually #3256. Not sure why the error text is hidden, but nothing in this PR seems to be causing any error. |
24.0.0 (June 17, 2024) New feature release in the 24.0.x series. This release is an incremental improvement on 23.2.x, with some fixes for bugs discovered in the updated workflow. New features include separation of HTML reports by session for subjects with many BOLD runs, a new ``--fs-no-resume`` option to improve interoperability with less typical FreeSurfer directories, such as those generated by longitudinal FreeSurfer or FastSurfer, and adoption of DatasetLinks and BIDS-URIs, to follow the recommendations of recent versions of BIDS. With thanks to Dimitri Papadopoulos, Basile Pinsard, Celine Provins, Taylor Salo and Wang Hao-Ting for their contributions! * FIX: Add "double" type to allowed DisplacementFieldTransform (#3287) * FIX: Require recent templateflow, select correct aparc dseg.tsv (#3256) * FIX: Ensure proper templates are retrieved with sloppy (#3251) * FIX: Delete summary from functional report when separated by sessions (#3223) * FIX: Support lists in bids filter file containing ``null`` or ``*`` (#3215) * FIX: Re-enable anat fasttrack for dataset without t1w (#3202) * ENH: Use BIDSURI in init_ds_boldmask_wf (#3297) * ENH: Add templateflow to DatasetLinks (#3267) * ENH: Track proximal sources of functional GIFTIs (#3263) * ENH: Support named derivative paths (#3264) * ENH: Track Sources for standard-space outputs (#3262) * ENH: Add --fs-no-resume option to reuse existing FreeSurfer outputs without resuming (#3142) * ENH: Use BIDS URIs to track Sources in sidecars (#3255) * ENH: Ignore unselected subjects in BIDSLayoutIndexer (#3236) * ENH: Add metadata for motion parameters (#3245) * ENH: Separate anatomical and functional reports per session for densely sampled dataset (#3191) * ENH: Leverage T2w if available for BOLD -> anat coregistration (#3208) * RF: Fix ITK warp conversion to nitransforms format (#3300) * RF: Load report assembler from nireports (#3177) * DOC: Clarify ``--dvars-spike-threshold`` uses standardized DVARS (#3205) * TST: Update test to reflect new report generation behavior (#3210) * STY: Manual conversions to f-strings (#3241) * STY: Apply ruff/pyupgrade rule UP031 (#3280) * STY: Lint and style check full repository (#3221) * STY: Adopt ruff for linting and formatting (#3206) * MNT: Pin libitk 5.3 and note dependencies (#3298) * MNT: Upgrade ruff pre-commit, add fixing checks (#3283) * MNT: Complete transition from flake8/black to ruff (#3279) * MNT: Apply Repo-Review suggestions (#3194) * MNT: Verbatim copy of Apache license 2.0 (#3259) * MNT: Bump cryptography from 41.0.7 to 42.0.4 (#3234) * MNT: Drop copyright year, unused dunder fields (#3247) * MNT: Update environment pins (#3226) * MNT: Bump codecov/codecov-action from 3 to 4 (#3219) * DOCKER: Restore mincinfo binary (#3249) * CI: Move to new circle machine tags (#3248) * CI: Avoid ruff warning (#3244) * CI: Pass ruff tests (#3243)
Closes #3252. This is just a first pass- it only modifies the RawSources for now. I can add the immediate Sources in another PR (this'll require a lot more effort).
Changes proposed in this pull request
DatasetLinks
field to thedataset_description.json
raw
--derivatives
are automatically namedderiv-<index>
. We might want to support named derivatives at some point.RawSources
fields with BIDS-URIs.RawSources
toSources
in the sidecar files, sinceRawSources
is deprecated.Documentation that should be reviewed
I'll probably need to update the documentation, but haven't yet.