DM-27147: rework collection names and add levels of indirection for long-lived repos #327
Conversation
This file contains 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
timj
approved these changes
Nov 16, 2020
python/lsst/obs/base/_instrument.py
Outdated
| them with the standard collection name delimeter. If provided, | ||
| these are appended to the names of the `~CollectionType.RUN` | ||
| these are inserted into to the names of the `~CollectionType.RUN` |
python/lsst/obs/base/_instrument.py
Outdated
|
|
||
| Returns | ||
| ------- | ||
| name : `str` | ||
| Run collection name. | ||
| """ | ||
| return cls.makeCollectionName("calib", "unbounded", *suffixes) | ||
| tail = labels + ("unbounded",) | ||
| return cls.makeCollectionName("calib", *tail) |
There was a problem hiding this comment.
I'm pretty sure that:
return cls.makeCollectionName("calib", *labels, "unbounded")works fine, so here and below there should be no need to make the temporary list.
| if os.path.isabs(self.path): | ||
| if not os.path.isabs(root): | ||
| root = os.path.abspath(root) | ||
| chainName = os.path.relpath(self.path, root) |
There was a problem hiding this comment.
Part of me feels that pathlib.Path.relative_to is what you are really wanting to use here which should tell you if the two don't overlap but this would all be simpler as ButlerURI:
path_uri = ButlerURI(self.path)
root_uri = ButlerURI(root)
if path_uri.relative_to(root_uri) is None:
raise ValueError(...)There was a problem hiding this comment.
The ButlerURI approach sounds perfect; I'll go with that.
python/lsst/obs/base/ingest_tests.py
Outdated
| # the original exception indicating that we can't hard-link | ||
| # on this filesystem to be turned into a nonzero exit code, which | ||
| # then trips the test assertion. | ||
| except AssertionError as err: |
There was a problem hiding this comment.
Maybe we could list both errors here then so we don't need to worry about it again?
TallJimbo
force-pushed
the
tickets/DM-27147
branch
from
e094457
to
07cb2b8
Compare
timj
reviewed
Nov 17, 2020
| return | ||
| if self.chainName is None: | ||
| if os.path.isabs(self.path): | ||
| if not os.path.isabs(root): |
There was a problem hiding this comment.
This if can be removed. The ButlerURI constructor will do it anyhow.
TallJimbo
force-pushed
the
tickets/DM-27147
branch
from
07cb2b8
to
eebffa6
Compare
Instead of these extra strings being appended to the end of collection names, they're now inserted directly after "<instrument>/calib", so when we name a set of related collections after a ticket branch, all of those collections will start with a common prefix.
This changes the interface for ConvertRepoTask, but not its default behavior or the 'butler convert' command-line interface.
We no longer rely on per-instrument overrides to point each specific refcat at the right RUN collection, and add a level of indirection to make it easier to add new refcats later.
...and note its limitations.
Ideally this label would be something intrinsic to the version of the curated calibs, but that's not avalable, and we need something here to make room for multiple curated calibration writes over the lifetime of the data repo.
TallJimbo
force-pushed
the
tickets/DM-27147
branch
from
eebffa6
to
f2f70b8
Compare
TallJimbo
force-pushed
the
tickets/DM-27147
branch
from
f2f70b8
to
84eda07
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.