mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Respect in-flight requests in source tree and lookahead resolver (#11711)

Browse source 
## Summary

Likely not critical since these tend to run prior to resolution rather
than in parallel with it, but we _should_ respect in-flight requests
here.
This commit is contained in:
Charlie Marsh 2025-02-22 12:12:17 -10:00 • committed by GitHub
parent 3fe2882fd5
commit 0b3d91c73a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/uv-requirements/src/lookahead.rs
View file

@ -148,22 +148,7 @@ impl<'a, Context: BuildContext> LookaheadResolver<'a, Context> {
// Fetch the metadata for the distribution.
let metadata = {
let id = dist.version_id();
if let Some(archive) =
self.index
.distributions()
.get(&id)
.as_deref()
.and_then(|response| {
if let MetadataResponse::Found(archive, ..) = response {
Some(archive)
} else {
None
}
})
{
// If the metadata is already in the index, return it.
archive.metadata.clone()
} else {
if self.index.distributions().register(id.clone()) {
// Run the PEP 517 build process to extract metadata from the source distribution.
let archive = self
.database
@ -179,6 +164,17 @@ impl<'a, Context: BuildContext> LookaheadResolver<'a, Context> {
.done(id, Arc::new(MetadataResponse::Found(archive)));
metadata
} else {
let response = self
.index
.distributions()
.wait(&id)
.await
.expect("missing value for registered task");
let MetadataResponse::Found(archive) = &*response else {
panic!("Failed to find metadata for: {requirement}");
};
archive.metadata.clone()
}
};

36
crates/uv-requirements/src/source_tree.rs
View file

@ -195,36 +195,32 @@ impl<'a, Context: BuildContext> SourceTreeResolver<'a, Context> {
};
// Fetch the metadata for the distribution.
//
// TODO(charlie): Respect in-flight fetches.
let metadata = {
let id = VersionId::from_url(source.url());
if let Some(archive) =
self.index
.distributions()
.get(&id)
.as_deref()
.and_then(|response| {
if let MetadataResponse::Found(archive) = response {
Some(archive)
} else {
None
}
})
{
// If the metadata is already in the index, return it.
archive.metadata.clone()
} else {
if self.index.distributions().register(id.clone()) {
// Run the PEP 517 build process to extract metadata from the source distribution.
let source = BuildableSource::Url(source);
let archive = self.database.build_wheel_metadata(&source, hashes).await?;
let metadata = archive.metadata.clone();
// Insert the metadata into the index.
self.index
.distributions()
.done(id, Arc::new(MetadataResponse::Found(archive.clone())));
.done(id, Arc::new(MetadataResponse::Found(archive)));
archive.metadata
metadata
} else {
let response = self
.index
.distributions()
.wait(&id)
.await
.expect("missing value for registered task");
let MetadataResponse::Found(archive) = &*response else {
panic!("Failed to find metadata for: {}", path.user_display());
};
archive.metadata.clone()
}
};