Skip to content

Apply restrictions on parent tables in fetch_nwb #1086

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.

Sign up for GitHub

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

Merged
samuelbray32 merged 8 commits into from
Sep 16, 2024
Merged

Apply restrictions on parent tables in fetch_nwb #1086

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9039c0e
include upstream restriction in fetch_nwb
samuelbray32 Sep 4, 2024
ed5395b
update changelog
samuelbray32 Sep 4, 2024
138371f
lint
samuelbray32 Sep 4, 2024
39080b9
resolve case of string restrictions
samuelbray32 Sep 16, 2024
f685dad
move extract_merge_id to class method
samuelbray32 Sep 16, 2024
601ed56
Apply suggestions from code review
samuelbray32 Sep 16, 2024
b8d25ed
Merge branch 'master' into merge_fetch_nwb_fix
samuelbray32 Sep 16, 2024
df0b49d
fix lint
samuelbray32 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Infrastructure

- Disable populate transaction protection for long-populating tables #1066
- Allow restriction based on parent keys in `Merge.fetch_nwb()` #1086

### Pipelines

Expand Down
6 changes: 3 additions & 3 deletions src/spyglass/utils/dj_merge_tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,9 +540,9 @@ def fetch_nwb(
self & {self._reserved_sk: source} & restriction
).fetch("KEY")
nwb_list.extend(
self.merge_restrict_class(
source_restr, permit_multiple_rows=True
).fetch_nwb()
(self & source_restr)
.merge_restrict_class(restriction, permit_multiple_rows=True)
.fetch_nwb()
)
if return_merge_ids:
merge_ids.extend([k[self._reserved_pk] for k in source_restr])
Expand Down
⚡