konsti
62bf92132b
When a process is running and another calls `uv cache clean` or `uv cache prune` we currently deadlock - sometimes until the CI timeout (https://github.com/astral-sh/setup-uv/issues/588). To avoid this, we add a default 5 min timeout waiting for a lock. 5 min balances allowing in-progress builds to finish, especially with larger native dependencies, while also giving timely errors for deadlocks on (remote) systems. Commit 1 is a refactoring. This branch also fixes a problem with the logging where acquired and released resources currently mismatch: ``` DEBUG Acquired lock for `https://github.com/tqdm/tqdm` DEBUG Using existing Git source `https://github.com/tqdm/tqdm` DEBUG Released lock at `C:\Users\Konsti\AppData\Local\uv\cache\git-v0\locks\16bb813afef8edd2` ```
52 lines
1.3 KiB
Rust
52 lines
1.3 KiB
Rust
use std::ops::Deref;
|
|
|
|
use anyhow::{Result, bail};
|
|
use clap::Parser;
|
|
use futures::TryStreamExt;
|
|
use tokio_util::compat::FuturesAsyncReadCompatExt;
|
|
|
|
use uv_cache::{Cache, CacheArgs};
|
|
use uv_client::{BaseClientBuilder, RegistryClientBuilder};
|
|
use uv_pep508::VerbatimUrl;
|
|
use uv_pypi_types::ParsedUrl;
|
|
use uv_settings::EnvironmentOptions;
|
|
|
|
#[derive(Parser)]
|
|
pub(crate) struct ValidateZipArgs {
|
|
url: VerbatimUrl,
|
|
#[command(flatten)]
|
|
cache_args: CacheArgs,
|
|
}
|
|
|
|
pub(crate) async fn validate_zip(
|
|
args: ValidateZipArgs,
|
|
environment: EnvironmentOptions,
|
|
) -> Result<()> {
|
|
let cache = Cache::try_from(args.cache_args)?.init().await?;
|
|
let client = RegistryClientBuilder::new(
|
|
BaseClientBuilder::default().timeout(environment.http_timeout),
|
|
cache,
|
|
)
|
|
.build();
|
|
|
|
let ParsedUrl::Archive(archive) = ParsedUrl::try_from(args.url.to_url())? else {
|
|
bail!("Only archive URLs are supported");
|
|
};
|
|
|
|
let response = client
|
|
.uncached_client(&archive.url)
|
|
.get(archive.url.deref().clone())
|
|
.send()
|
|
.await?;
|
|
let reader = response
|
|
.bytes_stream()
|
|
.map_err(std::io::Error::other)
|
|
.into_async_read();
|
|
|
|
let target = tempfile::TempDir::new()?;
|
|
|
|
uv_extract::stream::unzip(reader.compat(), target.path()).await?;
|
|
|
|
Ok(())
|
|
}
|