Add basic tool.uv.sources support

Cargo.toml

@@ -116,7 +116,7 @@ rmp-serde = { version = "1.1.2" }
 rust-netrc = { version = "0.1.1" }
 rustc-hash = { version = "1.1.0" }
 same-file = { version = "1.0.6" }
-schemars = { version = "0.8.16" }
+schemars = { version = "0.8.16", features = ["url"] }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197" }
 serde_json = { version = "1.0.114" }

crates/bench/benches/uv.rs

@@ -2,8 +2,7 @@ use std::str::FromStr;
 
 use bench::criterion::black_box;
 use bench::criterion::{criterion_group, criterion_main, measurement::WallTime, Criterion};
-
-use pep508_rs::Requirement;
+use distribution_types::Requirement;
 use uv_cache::Cache;
 use uv_client::RegistryClientBuilder;
 use uv_resolver::Manifest;
@@ -15,7 +14,10 @@ fn resolve_warm_jupyter(c: &mut Criterion<WallTime>) {
         .unwrap();
 
     let cache = &Cache::from_path(".cache").unwrap();
-    let manifest = &Manifest::simple(vec![Requirement::from_str("jupyter").unwrap()]);
+    let manifest = &Manifest::simple(vec![Requirement::from_pep508(
+        pep508_rs::Requirement::from_str("jupyter").unwrap(),
+    )
+    .unwrap()]);
     let client = &RegistryClientBuilder::new(cache.clone()).build();
 
     let run = || {
@@ -35,13 +37,14 @@ criterion_group!(uv, resolve_warm_jupyter);
 criterion_main!(uv);
 
 mod resolver {
-    use anyhow::Result;
-    use once_cell::sync::Lazy;
     use std::path::{Path, PathBuf};
     use std::str::FromStr;
 
-    use distribution_types::{IndexLocations, Resolution, SourceDist};
-    use pep508_rs::{MarkerEnvironment, Requirement, StringVersion};
+    use anyhow::Result;
+    use once_cell::sync::Lazy;
+
+    use distribution_types::{IndexLocations, Requirement, Resolution, SourceDist};
+    use pep508_rs::{MarkerEnvironment, StringVersion};
     use platform_tags::{Arch, Os, Platform, Tags};
     use uv_cache::Cache;
     use uv_client::RegistryClient;

crates/distribution-types/Cargo.toml

@@ -26,6 +26,7 @@ uv-normalize = { workspace = true }
 anyhow = { workspace = true }
 fs-err = { workspace = true }
 git2 = { workspace = true }
+indexmap = { workspace = true }
 itertools = { workspace = true }
 once_cell = { workspace = true }
 rkyv = { workspace = true }

crates/distribution-types/src/cached.rs

@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 
 use distribution_filename::WheelFilename;
 use pep508_rs::VerbatimUrl;
@@ -111,10 +111,14 @@ impl CachedDist {
                     assert_eq!(dist.url.scheme(), "file", "{}", dist.url);
                     Ok(Some(ParsedUrl::LocalFile(ParsedLocalFileUrl {
                         url: dist.url.raw().clone(),
+                        path: dist
+                            .url
+                            .to_file_path()
+                            .map_err(|()| anyhow!("Invalid path in file URL"))?,
                         editable: dist.editable,
                     })))
                 } else {
-                    Ok(Some(ParsedUrl::try_from(dist.url.raw())?))
+                    Ok(Some(ParsedUrl::try_from(dist.url.to_url())?))
                 }
             }
         }

crates/distribution-types/src/error.rs

@@ -1,4 +1,6 @@
 use url::Url;
+
+use pep508_rs::VerbatimUrl;
 use uv_normalize::PackageName;
 
 #[derive(thiserror::Error, Debug)]
@@ -23,4 +25,7 @@ pub enum Error {
 
     #[error("Requested package name `{0}` does not match `{1}` in the distribution filename: {2}")]
     PackageNameMismatch(PackageName, PackageName, String),
+
+    #[error("Only directories can be installed as editable, not filenames: `{0}`")]
+    EditableFile(VerbatimUrl),
 }

crates/distribution-types/src/installed.rs

@@ -7,6 +7,7 @@ use tracing::warn;
 use url::Url;
 
 use pep440_rs::Version;
+use pypi_types::DirectUrl;
 use uv_fs::Simplified;
 use uv_normalize::PackageName;
 
@@ -32,6 +33,7 @@ pub struct InstalledRegistryDist {
 pub struct InstalledDirectUrlDist {
     pub name: PackageName,
     pub version: Version,
+    pub direct_url: Box<DirectUrl>,
     pub url: Url,
     pub editable: bool,
     pub path: PathBuf,
@@ -60,7 +62,8 @@ impl InstalledDist {
                     Ok(url) => Ok(Some(Self::Url(InstalledDirectUrlDist {
                         name,
                         version,
-                        editable: matches!(&direct_url, pypi_types::DirectUrl::LocalDirectory { dir_info, .. } if dir_info.editable == Some(true)),
+                        editable: matches!(&direct_url, DirectUrl::LocalDirectory { dir_info, .. } if dir_info.editable == Some(true)),
+                        direct_url: Box::new(direct_url),
                         url,
                         path: path.to_path_buf(),
                     }))),
@@ -101,12 +104,12 @@ impl InstalledDist {
     }
 
     /// Read the `direct_url.json` file from a `.dist-info` directory.
-    pub fn direct_url(path: &Path) -> Result<Option<pypi_types::DirectUrl>> {
+    pub fn direct_url(path: &Path) -> Result<Option<DirectUrl>> {
         let path = path.join("direct_url.json");
         let Ok(file) = fs_err::File::open(path) else {
             return Ok(None);
         };
-        let direct_url = serde_json::from_reader::<fs_err::File, pypi_types::DirectUrl>(file)?;
+        let direct_url = serde_json::from_reader::<fs_err::File, DirectUrl>(file)?;
         Ok(Some(direct_url))
     }
 

crates/distribution-types/src/lib.rs

@@ -56,8 +56,10 @@ pub use crate::index_url::*;
 pub use crate::installed::*;
 pub use crate::parsed_url::*;
 pub use crate::prioritized_distribution::*;
+pub use crate::requirement::*;
 pub use crate::resolution::*;
 pub use crate::resolved::*;
+pub use crate::specified_requirement::*;
 pub use crate::traits::*;
 
 mod any;
@@ -72,8 +74,10 @@ mod index_url;
 mod installed;
 mod parsed_url;
 mod prioritized_distribution;
+mod requirement;
 mod resolution;
 mod resolved;
+mod specified_requirement;
 mod traits;
 
 #[derive(Debug, Clone)]
@@ -228,8 +232,8 @@ impl Dist {
     }
 
     /// A remote built distribution (`.whl`) or source distribution from a `http://` or `https://`
-    /// url.
-    fn from_http_url(name: PackageName, url: VerbatimUrl) -> Result<Dist, Error> {
+    /// URL.
+    pub fn from_http_url(name: PackageName, url: VerbatimUrl) -> Result<Dist, Error> {
         if Path::new(url.path())
             .extension()
             .is_some_and(|ext| ext.eq_ignore_ascii_case("whl"))
@@ -256,8 +260,12 @@ impl Dist {
         }
     }
 
-    /// A local built or source distribution from a `file://` url.
-    fn from_file_url(name: PackageName, url: VerbatimUrl) -> Result<Dist, Error> {
+    /// A local built or source distribution from a `file://` URL.
+    pub fn from_file_url(
+        name: PackageName,
+        url: VerbatimUrl,
+        editable: bool,
+    ) -> Result<Dist, Error> {
         // Store the canonicalized path, which also serves to validate that it exists.
         let path = match url
             .to_file_path()
@@ -285,6 +293,10 @@ impl Dist {
                 ));
             }
 
+            if editable {
+                return Err(Error::EditableFile(url));
+            }
+
             Ok(Self::Built(BuiltDist::Path(PathBuiltDist {
                 filename,
                 url,
@@ -295,7 +307,7 @@ impl Dist {
                 name,
                 url,
                 path,
-                editable: false,
+                editable,
             })))
         }
     }
@@ -305,11 +317,12 @@ impl Dist {
         Ok(Self::Source(SourceDist::Git(GitSourceDist { name, url })))
     }
 
+    // TODO(konsti): We should carry the parsed URL through the codebase.
     /// Create a [`Dist`] for a URL-based distribution.
     pub fn from_url(name: PackageName, url: VerbatimUrl) -> Result<Self, Error> {
         match Scheme::parse(url.scheme()) {
             Some(Scheme::Http | Scheme::Https) => Self::from_http_url(name, url),
-            Some(Scheme::File) => Self::from_file_url(name, url),
+            Some(Scheme::File) => Self::from_file_url(name, url, false),
             Some(Scheme::GitSsh | Scheme::GitHttps) => Self::from_git_url(name, url),
             Some(Scheme::GitGit | Scheme::GitHttp) => Err(Error::UnsupportedScheme(
                 url.scheme().to_owned(),