Add butler chaining to ButlerStandardizer #1130
Open
+114
−31
Conversation
This file contains hidden or 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
wilsonbb
requested changes
Feb 4, 2026
Collaborator
wilsonbb
left a comment
wilsonbb
left a comment
There was a problem hiding this comment.
This looks right to me, some small suggestions about slight code re-organizing to consider. Will follow-up with an explicit test on USDF
| else: | ||
| butlers = butler | ||
|
|
||
| for b in butlers: |
Collaborator
There was a problem hiding this comment.
I would consider instead something like
for b in butlers:
self.ref = self.__query_butler(tgt, b)
if self.ref is not None:
# Use the first butler we find our reference in
self.butler = b
break
if self.ref is None:
raise ValueError(f"Unable to resolve target {tgt} for any butler.")
This helps us get rid of the butler local varible
Comment on lines
+234
to
+235
| else: | ||
| butlers = butler |
Collaborator
There was a problem hiding this comment.
By renaming the argument from butler to butlers, we can get rid of this else branch.
| """Given a target and a butler, which might not contain the target | ||
| queries the butler to resolve it. Butler failures are silenced. | ||
|
|
||
| Has to be called after deffered_import. |
| self.compare_to_expected(7, standardized) | ||
|
|
||
| # Test chained resolution works. | ||
| std = Standardizer.get(DatasetId(7, fill_metadata=True), butler=[self.failed_butler, self.butler]) |
Collaborator
There was a problem hiding this comment.
Maybe we could add some small tests that
butler=[self.failed_butler, self.failed_butler]throws an error.- For
butler=[self.butler2, self.butler]we could check thatstd.butler is self.butler2
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.
Resolves #872
Adds a test for chained butlers when the first butler resolves to
None, but this needs to be tested in-vivo over multiple repos on SLAC because I don't know what the failure modes actually are. I can't login to s3df.