Skip to content
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

DM-45738: Experiments with extending butler collections API #1053

Merged
merged 26 commits into from
Aug 19, 2024
Merged

Conversation

timj
Copy link
Member

@timj timj commented Aug 13, 2024

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes
  • (if changing dimensions.yaml) make a copy of dimensions.yaml in configs/old_dimensions

Copy link

codecov bot commented Aug 13, 2024

Codecov Report

Attention: Patch coverage is 84.80000% with 57 lines in your changes missing coverage. Please review.

Project coverage is 89.54%. Comparing base (028a2be) to head (dc4b3cb).
Report is 27 commits behind head on main.

Files Patch % Lines
python/lsst/daf/butler/script/exportCalibs.py 10.00% 9 Missing ⚠️
python/lsst/daf/butler/_butler_collections.py 88.88% 2 Missing and 4 partials ⚠️
...thon/lsst/daf/butler/script/certifyCalibrations.py 0.00% 6 Missing ⚠️
python/lsst/daf/butler/script/transferDatasets.py 0.00% 5 Missing ⚠️
...butler/remote_butler/_remote_butler_collections.py 88.23% 2 Missing and 2 partials ⚠️
python/lsst/daf/butler/script/queryDatasetTypes.py 20.00% 3 Missing and 1 partial ⚠️
python/lsst/daf/butler/script/queryDatasets.py 71.42% 2 Missing and 2 partials ⚠️
tests/test_remote_butler.py 60.00% 4 Missing ⚠️
...butler/direct_butler/_direct_butler_collections.py 95.34% 2 Missing ⚠️
...on/lsst/daf/butler/remote_butler/_remote_butler.py 77.77% 2 Missing ⚠️
... and 7 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1053      +/-   ##
==========================================
- Coverage   89.57%   89.54%   -0.04%     
==========================================
  Files         357      359       +2     
  Lines       46190    46382     +192     
  Branches     9487     9540      +53     
==========================================
+ Hits        41374    41531     +157     
- Misses       3484     3508      +24     
- Partials     1332     1343      +11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@timj timj force-pushed the tickets/DM-45738 branch 11 times, most recently from 471f3fd to 2b7b444 Compare August 15, 2024 20:55
@timj timj marked this pull request as ready for review August 15, 2024 22:23
python/lsst/daf/butler/_butler_collections.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_butler_collections.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_butler_collections.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_butler_collections.py Show resolved Hide resolved
python/lsst/daf/butler/_butler_collections.py Show resolved Hide resolved
python/lsst/daf/butler/_butler_collections.py Show resolved Hide resolved
still referenced by some other table, such as a dataset in a
datastore (for `~CollectionType.RUN` collections only) or a
`~CollectionType.CHAINED` collection of which this collection is
a child.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to catch and reraise the SQLAlchemy error in order to have any chance at consistency between DirectButler and RemoteButler.

In fact, this seems like a good place to pull some of the CLI script logic into the Butler itself, by providing options for breaking parent relationships where necessary instead of just raising.

python/lsst/daf/butler/script/transferDatasets.py Outdated Show resolved Hide resolved
@timj timj force-pushed the tickets/DM-45738 branch 3 times, most recently from a5afe90 to c140084 Compare August 16, 2024 18:19
@timj timj merged commit 287565a into main Aug 19, 2024
16 of 18 checks passed
@timj timj deleted the tickets/DM-45738 branch August 19, 2024 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants