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.

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

Jump to bottom

daf_persistence: make Butler.datasetExists work with composite datasets #62

Merged
merged 2 commits into from
Jun 29, 2017
Merged

daf_persistence: make Butler.datasetExists work with composite datasets #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20a8045
make Butler.datasetExists work with composite datasets
n8pease Jun 27, 2017
52d2432
code review fixes
n8pease Jun 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 16 additions & 9 deletions python/lsst/daf/persistence/butler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link

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.

Copy link
Contributor

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?

Copy link
Contributor Author

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.

if exists is False:
Copy link

Choose a reason for hiding this comment

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

suggestion: if not exists:

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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.
Expand Down