-
Notifications
You must be signed in to change notification settings - Fork 2
pass None for default preprocessing config #178
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
Open
alessandrofelder
wants to merge
6
commits into
main
Choose a base branch
from
allow-none-config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8fac89b
pass None for default preprocessing config
alessandrofelder f616822
fix introduced bug discovered by test
alessandrofelder fee2c22
update test docstring
alessandrofelder 1303718
ignore biorxiv read time-outs
alessandrofelder b91cdb0
more linkcheck ignores
alessandrofelder e386707
finally fix linkchecks
alessandrofelder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,10 @@ | |
| ) | ||
| from brainglobe_template_builder.utils.cropping import crop_to_mask | ||
| from brainglobe_template_builder.utils.masking import create_mask | ||
| from brainglobe_template_builder.utils.preproc_config import PreprocConfig | ||
| from brainglobe_template_builder.utils.preproc_config import ( | ||
| MaskConfig, | ||
| PreprocConfig, | ||
| ) | ||
| from brainglobe_template_builder.validate import validate_input_csv | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
@@ -158,7 +161,9 @@ def _process_subject( | |
| } | ||
|
|
||
|
|
||
| def preprocess(standardised_csv: Path, config: Path | PreprocConfig) -> None: | ||
| def preprocess( | ||
| standardised_csv: Path, config: Path | PreprocConfig | None = None | ||
| ) -> None: | ||
| """Process nifti files in ASR orientation to create output images + | ||
| masks ready for template creation. | ||
|
|
||
|
|
@@ -189,12 +194,19 @@ def preprocess(standardised_csv: Path, config: Path | PreprocConfig) -> None: | |
| standardised_csv : Path | ||
| Standardised csv file path. One row per sample, each with a | ||
| unique 'subject_id' - this is created via `standardise`. | ||
| config : Path | PreprocConfig | ||
| config : Path | PreprocConfig | None | ||
| Config yaml file path, or PreprocConfig object. Contains settings for | ||
| pre-processing steps. | ||
| pre-processing steps. Defaults to None, which will use defaults. | ||
| """ | ||
|
|
||
| if isinstance(config, Path): | ||
| if not config: | ||
| # use default mask and padding, and default to outputting | ||
| # into sibling folder of `standardised/` | ||
| preproc_config = PreprocConfig( | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why not just define MaskConfig() as the default argument for PreprocConfig simplify. |
||
| output_dir=standardised_csv.parent.parent, | ||
| mask=MaskConfig(), | ||
| ) | ||
| elif isinstance(config, Path): | ||
| with open(config) as f: | ||
| config_yaml = yaml.safe_load(f) | ||
| preproc_config = PreprocConfig.model_validate(config_yaml) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
This assumes config is truthy. its fine but it would be safer to say if config is None