-
Notifications
You must be signed in to change notification settings - Fork 10
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
FIX: nest pathlib import in fix_multi_source_name #365
Conversation
- I've kept the top level import because other functions still use Path. Let's see if that causes any flakes with the linter...
- currently the if-statement in the function is very specific and ensures that the message both starts with 'global name' and 'is not defined'. nipreps/nibabies#365 shows that there is at least one example where this function does not catch a NameError that arises from a module-level import, where instead a less informative 'Variable' is not defined is thrown instead of saying 'hey, make sure modules/functions you call are imported at the function level'
…ect_function more permissive the if-statement in this function is very specific and ensures that the error message both starts with "global name" and ends with "is not defined" before raising the informative error about nested imports. nipreps/nibabies#365 gives one example where this if-statement is too specific, and doesn't catch a NameError that does actually arise from a module-level import.
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.
Thanks for the fix! This wasn't caught by the doctest since it isn't executed in context of a nipype wrapped function - the only ways I can think to better test these instances are:
- Wrap all functions used in connection statements as nipype
Function
s and test separately. - Add a dataset to CI to test the pathway (in this case multi-anat)
Given that this is a quick bug fix and a large refactor of the codebase is nearing completion (#360), I'm inclined to just merging as is for the time being.
Ah, nice! sure, since it just duplicates an import it doesn't risk breaking existing code, so up to you! |
24.0.0 (August 29, 2024) This major release includes a substantial refactoring of the pipeline. One key addition is the addition of the `--level` flag, which can take the arguments minimal, resampling or full. The default is full, which should produce nearly the same results as previous versions. minimal will produce only the minimum necessary to deterministically generate the remaining derivatives. resampling will produce some additional derivatives, intended to simplify resampling with other tools. The `--derivatives` flag was altered to take arguments in the form `name=/path/to/dir`. For each directory provided, if a derivative is found - it will be used instead of computing it from scratch. If a derivative is not found, NiBabies will compute it and proceed as usual. Taken together, these features can allow a dataset provider to run a minimal NiBabies run, targeting many output spaces, while a user can then run a `--derivatives` run to generate additional derivatives in only the output spaces they need. Another use case is to provide an precomputed derivative to override the default NiBabies behavior, enabling easier workarounds for bugs or experimentation with alternatives. Another new feature is a dynamic anatomical reference, which is set based on surface reconstruction method or through the `--reference-anatomical` flag. Previously, T1w was the default output space. Now, the reference anatomical is determined based on the surface reconstruction method. Additionally, minor adjustments have been made to MCRIBS surface reconstruction to address failure rates. This is still an on-going investigation, but preliminary results look promising. This release resolves a number of issues with fieldmaps inducing distortions during correction. Phase difference and direct fieldmaps are now masked correctly, preventing the overestimation of distortions outside the brain. Additionally, we now implement Jacobian weighting during unwarping, which corrects for compression and expansion effects on signal intensity. To disable Jacobian weighting, add `fmap-jacobian` to the `--ignore` argument. Finally, a new resampling method has been added, to better account for susceptibility distortion and motion in a single shot resampling to a volumetric target space. We anticipate extending this to surface targets in the future. * FIX: nest pathlib import in fix_multi_source_name (#365) * FIX: Avoid retrieving multiple templates from latest TF (#353) * FIX: Raise informative error if no t1w or t2w found (#347) * FIX: Easier pyenv usage (#342) * FIX: Catch nonexistent derivatives, clean up subworkflow logic (#336) * FIX: Use fsLR reg sphere for MCRIBS morphometrics resampling (#334) * FIX: T2star map MNI scaling (#320) * ENH: Alter outputs when MCRIBS reconstruction is used (#329) * ENH: Use nireports for Report generation + add reportlet per reconstruction (#328) * ENH: better repr for Derivatives class (#351) * RF: Move to fit/apply workflow (#360) * RF: Replace `resource_filename` with `load_data` (#345) * MAINT: Bump urllib3 from 2.0.3 to 2.0.7 (#319) * MAINT: Raise minimum to 3.10, bump actions (#337) * MAINT: Bump pillow from 9.5.0 to 10.0.1 (#317) * MAINT: Update to latest migas API (#326) * DOC: Use correct argument flag (#338) * DOC: Move to new theme, add outputs description (#383)
…ect_function more permissive the if-statement in this function is very specific and ensures that the error message both starts with "global name" and ends with "is not defined" before raising the informative error about nested imports. nipreps/nibabies#365 gives one example where this if-statement is too specific, and doesn't catch a NameError that does actually arise from a module-level import.
…ect_function more permissive the if-statement in this function is very specific and ensures that the error message both starts with "global name" and ends with "is not defined" before raising the informative error about nested imports. nipreps/nibabies#365 gives one example where this if-statement is too specific, and doesn't catch a NameError that does actually arise from a module-level import.
Per nipype.pipeline.engine.utils.evaluate_connect_function:
If I'm understanding this right I think we need to nest the
pathlib.Path
import within fix_multi_source_name.Crash log that brought the issue to my attention
This PR fixed this issue on my side, but is there a unit test I can modify to check my understanding of the issue?
** FYI Looks like pathlib is still used by other functions in the
nibabies.utils.misc
module so I also kept the top level import ofPath
.. Let's see if that causes any flakes..