Respect visitation order for proxy packages #10833
Open
+713
−178
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
This reverts commit 56d39d2.
charliermarsh
added
bug
charliermarsh
force-pushed
the
charlie/rev
branch
from
480e17a to
d389f03
Compare
Would it fix #10425 if we visited the virtual packages inside the package-batch first? Like:
|
konstin
approved these changes
Jan 22, 2025
Comment on lines
+2304
to
-2313
| // Verify that the package is allowed under the hash-checking policy. | ||
| if !self | ||
| .hasher | ||
| .allows_package(candidate.name(), candidate.version()) | ||
| { | ||
| return Ok(None); | ||
| } | ||
|
|
||
| // Emit a request to fetch the metadata for this version. | ||
| if self.index.distributions().register(candidate.version_id()) { | ||
| // Verify that the package is allowed under the hash-checking policy. | ||
| if !self | ||
| .hasher | ||
| .allows_package(candidate.name(), candidate.version()) | ||
| { | ||
| return Err(ResolveError::UnhashedPackage(candidate.name().clone())); | ||
| } | ||
|
|
There was a problem hiding this comment.
Where are the hash changes coming from?
| /// Main priority and tiebreak for virtual packages | ||
| type Priority = (Option<PubGrubPriority>, u32); | ||
| /// Main priority and tiebreak for virtual packages. | ||
| type Priority = (Option<PubGrubPriority>, Option<PubGrubTiebreaker>); |
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.
Summary
This PR reverts #10441 and applies a different fix for #10425.
In #10441, I changed prioritization to visit proxies eagerly. I think this is actually wrong, since it means we prioritize proxy packages above everything else. And while a proxy only depends on itself, it does mean we're selecting a version for the proxy package earlier than anything else. So, if you look at #10828, we end up choosing a version for
async-timeoutbefore we choose a version forlangchain, despite the latter being a first-party dependency. (async-timeouthas a marker on it, so it has a proxy package, so we solve for it first.)To fix #10425, we instead need to make sure we visit proxies in the order we see them. I think the virtual tiebreaker for proxies is reversed? We want to visit the package we see first, first.
So, in short: this reverts #10441, then corrects the ordering for visiting proxies.
Closes #10828.