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

Use specialized error message for invalid Python install / uninstall requests (#5171)

Browse source 
## Summary

Closes https://github.com/astral-sh/uv/issues/4819.
This commit is contained in:
Charlie Marsh 2024-07-17 20:47:55 -04:00 • committed by GitHub
parent 622e9e8799
commit 91bf213641
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/uv-python/src/downloads.rs
View file

@ -68,8 +68,6 @@ pub enum Error {
NameError(String),
#[error("Failed to parse request part")]
InvalidRequestPlatform(#[from] platform::Error),
#[error("Cannot download managed Python for request: {0}")]
InvalidRequestKind(PythonRequest),
// TODO(zanieb): Implement display for `PythonDownloadRequest`
#[error("No download found for request: {0:?}")]
NoDownloadFound(PythonDownloadRequest),
@ -142,26 +140,23 @@ impl PythonDownloadRequest {
///
/// Returns [`None`] if the request kind is not compatible with a download, e.g., it is
/// a request for a specific directory or executable name.
pub fn try_from_request(request: &PythonRequest) -> Option<Self> {
Self::from_request(request).ok()
}
/// Construct a new [`PythonDownloadRequest`] from a [`PythonRequest`].
pub fn from_request(request: &PythonRequest) -> Result<Self, Error> {
pub fn from_request(request: &PythonRequest) -> Option<Self> {
match request {
PythonRequest::Version(version) => Ok(Self::default().with_version(version.clone())),
PythonRequest::Version(version) => Some(Self::default().with_version(version.clone())),
PythonRequest::Implementation(implementation) => {
Ok(Self::default().with_implementation(*implementation))
Some(Self::default().with_implementation(*implementation))
}
PythonRequest::ImplementationVersion(implementation, version) => Ok(Self::default()
.with_implementation(*implementation)
.with_version(version.clone())),
PythonRequest::Key(request) => Ok(request.clone()),
PythonRequest::Any => Ok(Self::default()),
PythonRequest::ImplementationVersion(implementation, version) => Some(
Self::default()
.with_implementation(*implementation)
.with_version(version.clone()),
),
PythonRequest::Key(request) => Some(request.clone()),
PythonRequest::Any => Some(Self::default()),
// We can't download a managed installation for these request kinds
PythonRequest::Directory(_)
| PythonRequest::ExecutableName(_)
| PythonRequest::File(_) => Err(Error::InvalidRequestKind(request.clone())),
| PythonRequest::File(_) => None,
}
}

4
crates/uv-python/src/installation.rs
View file

@ -90,7 +90,7 @@ impl PythonInstallation {
// Perform a fetch aggressively if managed Python is preferred
if matches!(preference, PythonPreference::Managed) && python_fetch.is_automatic() {
if let Some(request) = PythonDownloadRequest::try_from_request(&request) {
if let Some(request) = PythonDownloadRequest::from_request(&request) {
return Self::fetch(request.fill(), client_builder, cache, reporter).await;
}
}
@ -104,7 +104,7 @@ impl PythonInstallation {
&& python_fetch.is_automatic()
&& client_builder.connectivity.is_online() =>
{
if let Some(request) = PythonDownloadRequest::try_from_request(&request) {
if let Some(request) = PythonDownloadRequest::from_request(&request) {
debug!("Requested Python not found, checking for available download...");
match Self::fetch(request.fill(), client_builder, cache, reporter).await {
Ok(installation) => Ok(installation),