-
Notifications
You must be signed in to change notification settings - Fork 8
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
daf_persistence: make Butler.datasetExists work with composite datasets #62
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1245,17 +1245,24 @@ def datasetExists(self, datasetType, dataId={}, **rest): | |
datasetType = self._resolveDatasetTypeAlias(datasetType) | ||
dataId = DataId(dataId) | ||
dataId.update(**rest) | ||
location = self._locate(datasetType, dataId, write=False) | ||
if location is None: | ||
return False | ||
|
||
location = None | ||
for repoData in self._repos.inputs(): | ||
if not dataId.tag or len(dataId.tag.intersection(repoData.tags)) > 0: | ||
location = repoData.repo.map(datasetType, dataId) | ||
if location and location.repository.exists(location): | ||
break | ||
# If the location is a ButlerComposite (as opposed to a ButlerLocation), verify the component objects | ||
# exist. | ||
if isinstance(location, ButlerComposite): | ||
for name, componentInfo in location.componentInfo.items(): | ||
if componentInfo.subset: | ||
subset = self.subset(datasetType=componentInfo.datasetType, dataId=location.dataId) | ||
exists = all([obj.datasetExists() for obj in subset]) | ||
else: | ||
location = None | ||
|
||
return bool(location) | ||
exists = self.datasetExists(componentInfo.datasetType, location.dataId) | ||
if exists is False: | ||
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. suggestion: if not exists: 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. I've been shot down for that before; "the double negative is hard to parse" |
||
break | ||
else: | ||
exists = location.repository.exists(location) | ||
return exists | ||
|
||
def _locate(self, datasetType, dataId, write): | ||
"""Get one or more ButlerLocations and/or ButlercComposites. | ||
|
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.
PEP8: line above too long.
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.
The indentation looks odd. I believe that we are sticking to the 110 line limit; how long is this one?
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.
@RobertLuptonTheGood are you reading the code on the Conversation tab? ...Don't compare the red indentation to the green indentation. If you look at this line under View Changes you'll see the indentation is correct.
@kennywlo the line is 92 columns, < 110.