astral-sh · konstin · Jun 5, 2026 · Mar 5, 2026 · Mar 4, 2026 · May 21, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/uv-build-frontend/Cargo.toml b/crates/uv-build-frontend/Cargo.toml
@@ -17,6 +17,7 @@ workspace = true
 
 [dependencies]
 uv-auth = { workspace = true }
+uv-cache = { workspace = true }
 uv-cache-key = { workspace = true }
 uv-configuration = { workspace = true }
 uv-distribution = { workspace = true }

diff --git a/crates/uv-build-frontend/src/lib.rs b/crates/uv-build-frontend/src/lib.rs
@@ -28,6 +28,7 @@ use tokio::process::Command;
 use tokio::sync::{Mutex, Semaphore};
 use tracing::{Instrument, debug, info_span, instrument, warn};
 use uv_auth::CredentialsCache;
+use uv_cache::Cache;
 use uv_cache_key::cache_digest;
 use uv_configuration::{BuildKind, BuildOutput, NoSources};
 use uv_distribution::BuildRequires;
@@ -321,6 +322,7 @@ impl SourceBuild {
             fallback_package_name,
             locations,
             &no_sources,
+            build_context.cache(),
             workspace_cache,
             credentials_cache,
         )
@@ -572,6 +574,7 @@ impl SourceBuild {
         package_name: Option<&PackageName>,
         locations: &IndexLocations,
         no_sources: &NoSources,
+        cache: &Cache,
         workspace_cache: &WorkspaceCache,
         credentials_cache: &CredentialsCache,
     ) -> Result<(Pep517Backend, Option<Project>), Box<Error>> {
@@ -652,6 +655,7 @@ impl SourceBuild {
                     locations,
                     no_sources,
                     true,
+                    cache,
                     workspace_cache,
                     credentials_cache,
                 )
@@ -1100,6 +1104,7 @@ async fn create_pep517_build_environment(
             build_context
                 .source_tree_editable_policy()
                 .workspace_member_editable(None),
+            build_context.cache(),
             workspace_cache,
             credentials_cache,
         )

diff --git a/crates/uv-distribution/src/metadata/build_requires.rs b/crates/uv-distribution/src/metadata/build_requires.rs
@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 use std::path::Path;
 
 use uv_auth::CredentialsCache;
+use uv_cache::Cache;
 use uv_configuration::NoSources;
 use uv_distribution_types::{
     ExtraBuildRequirement, ExtraBuildRequires, IndexLocations, Requirement,
@@ -43,7 +44,8 @@ impl BuildRequires {
         locations: &IndexLocations,
         sources: &NoSources,
         editable: bool,
-        cache: &WorkspaceCache,
+        cache: &Cache,
+        workspace_cache: &WorkspaceCache,
         credentials_cache: &CredentialsCache,
     ) -> Result<Self, MetadataError> {
         let discovery = if sources.all() {
@@ -54,8 +56,13 @@ impl BuildRequires {
         } else {
             DiscoveryOptions::default()
         };
-        let Some(project_workspace) =
-            ProjectWorkspace::from_maybe_project_root(install_path, &discovery, cache).await?
+        let Some(project_workspace) = ProjectWorkspace::from_maybe_project_root(
+            install_path,
+            &discovery,
+            cache,
+            workspace_cache,
+        )
+        .await?
         else {
             return Ok(Self::from_metadata23(metadata));
         };

diff --git a/crates/uv-distribution/src/metadata/dependency_groups.rs b/crates/uv-distribution/src/metadata/dependency_groups.rs
@@ -2,13 +2,15 @@ use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
 use uv_auth::CredentialsCache;
+use uv_cache::Cache;
 use uv_configuration::NoSources;
 use uv_distribution_types::{IndexLocations, Requirement};
 use uv_normalize::{GroupName, PackageName};
 use uv_workspace::dependency_groups::FlatDependencyGroups;
 use uv_workspace::pyproject::{Sources, ToolUvSources};
 use uv_workspace::{
     DiscoveryOptions, MemberDiscovery, VirtualProject, WorkspaceCache, WorkspaceError,
+    WorkspaceErrorKind,
 };
 
 use crate::metadata::{GitWorkspaceMember, LoweredRequirement, MetadataError};
@@ -57,7 +59,8 @@ impl SourcedDependencyGroups {
         git_member: Option<&GitWorkspaceMember<'_>>,
         locations: &IndexLocations,
         no_sources: NoSources,
-        cache: &WorkspaceCache,
+        cache: &Cache,
+        workspace_cache: &WorkspaceCache,
         credentials_cache: &CredentialsCache,
     ) -> Result<Self, MetadataError> {
         // If the `pyproject.toml` doesn't exist, fail early.
@@ -80,15 +83,15 @@ impl SourcedDependencyGroups {
             } else {
                 MemberDiscovery::None
             },
-            ..DiscoveryOptions::default()
         };
 
         // The subsequent API takes an absolute path to the dir the pyproject is in
         let empty = PathBuf::new();
-        let absolute_pyproject_path =
-            std::path::absolute(pyproject_path).map_err(WorkspaceError::Normalize)?;
+        let absolute_pyproject_path = std::path::absolute(pyproject_path)
+            .map_err(|err| WorkspaceError::from(WorkspaceErrorKind::Normalize(err)))?;
         let project_dir = absolute_pyproject_path.parent().unwrap_or(&empty);
-        let project = VirtualProject::discover(project_dir, &discovery, cache).await?;
+        let project =
+            VirtualProject::discover(project_dir, &discovery, cache, workspace_cache).await?;
 
         // Collect the dependency groups.
         let dependency_groups =

diff --git a/crates/uv-distribution/src/metadata/mod.rs b/crates/uv-distribution/src/metadata/mod.rs
@@ -4,6 +4,7 @@ use std::path::{Path, PathBuf};
 use thiserror::Error;
 
 use uv_auth::CredentialsCache;
+use uv_cache::Cache;
 use uv_configuration::NoSources;
 use uv_distribution_types::{GitDirectorySourceUrl, IndexLocations, Requirement};
 use uv_normalize::{ExtraName, GroupName, PackageName};
@@ -101,7 +102,8 @@ impl Metadata {
         locations: &IndexLocations,
         sources: NoSources,
         editable: bool,
-        cache: &WorkspaceCache,
+        cache: &Cache,
+        workspace_cache: &WorkspaceCache,
         credentials_cache: &CredentialsCache,
     ) -> Result<Self, MetadataError> {
         // Lower the requirements.
@@ -125,6 +127,7 @@ impl Metadata {
             sources,
             editable,
             cache,
+            workspace_cache,
             credentials_cache,
         )
         .await?;

diff --git a/crates/uv-distribution/src/metadata/requires_dist.rs b/crates/uv-distribution/src/metadata/requires_dist.rs
@@ -5,6 +5,7 @@ use std::slice;
 use rustc_hash::FxHashSet;
 
 use uv_auth::CredentialsCache;
+use uv_cache::Cache;
 use uv_configuration::NoSources;
 use uv_distribution_types::{IndexLocations, Requirement};
 use uv_normalize::{ExtraName, GroupName, PackageName};
@@ -35,7 +36,8 @@ impl RequiresDist {
         locations: &IndexLocations,
         sources: NoSources,
         editable: bool,
-        cache: &WorkspaceCache,
+        cache: &Cache,
+        workspace_cache: &WorkspaceCache,
         credentials_cache: &CredentialsCache,
     ) -> Result<Self, MetadataError> {
         let discovery = DiscoveryOptions {
@@ -51,10 +53,14 @@ impl RequiresDist {
             } else {
                 MemberDiscovery::None
             },
-            ..DiscoveryOptions::default()
         };
-        let Some(project_workspace) =
-            ProjectWorkspace::from_maybe_project_root(install_path, &discovery, cache).await?
+        let Some(project_workspace) = ProjectWorkspace::from_maybe_project_root(
+            install_path,
+            &discovery,
+            cache,
+            workspace_cache,
+        )
+        .await?
         else {
             return Self::from_metadata23_with_source_context(metadata, git_member);
         };
@@ -454,6 +460,7 @@ mod test {
     use tempfile::TempDir;
 
     use uv_auth::CredentialsCache;
+    use uv_cache::Cache;
     use uv_configuration::NoSources;
     use uv_distribution_types::IndexLocations;
     use uv_normalize::PackageName;
@@ -468,12 +475,14 @@ mod test {
         contents: &str,
     ) -> anyhow::Result<RequiresDist> {
         fs_err::write(temp_dir.join("pyproject.toml"), contents)?;
+        let cache = Cache::from_path(temp_dir.join(".uv_cache"));
         let project_workspace = ProjectWorkspace::discover(
             temp_dir,
             &DiscoveryOptions {
                 stop_discovery_at: Some(temp_dir.to_path_buf()),
                 ..DiscoveryOptions::default()
             },
+            &cache,
             &WorkspaceCache::default(),
         )
         .await?;

diff --git a/crates/uv-distribution/src/source/mod.rs b/crates/uv-distribution/src/source/mod.rs
@@ -1479,6 +1479,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                         self.build_context.locations(),
                         self.build_context.sources().clone(),
                         editable,
+                        self.build_context.cache(),
                         self.build_context.workspace_cache(),
                         credentials_cache,
                     )
@@ -1534,6 +1535,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                             self.build_context.locations(),
                             self.build_context.sources().clone(),
                             editable,
+                            self.build_context.cache(),
                             self.build_context.workspace_cache(),
                             credentials_cache,
                         )
@@ -1585,6 +1587,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                     self.build_context.locations(),
                     self.build_context.sources().clone(),
                     editable,
+                    self.build_context.cache(),
                     self.build_context.workspace_cache(),
                     credentials_cache,
                 )
@@ -1648,6 +1651,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                 self.build_context.locations(),
                 self.build_context.sources().clone(),
                 editable,
+                self.build_context.cache(),
                 self.build_context.workspace_cache(),
                 credentials_cache,
             )
@@ -1727,6 +1731,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                     self.build_context
                         .source_tree_editable_policy()
                         .workspace_member_editable(None),
+                    self.build_context.cache(),
                     self.build_context.workspace_cache(),
                     credentials_cache,
                 )
@@ -2322,6 +2327,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                             self.build_context
                                 .source_tree_editable_policy()
                                 .workspace_member_editable(None),
+                            self.build_context.cache(),
                             self.build_context.workspace_cache(),
                             credentials_cache,
                         )
@@ -2359,6 +2365,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                                 self.build_context
                                     .source_tree_editable_policy()
                                     .workspace_member_editable(None),
+                                self.build_context.cache(),
                                 self.build_context.workspace_cache(),
                                 credentials_cache,
                             )
@@ -2415,6 +2422,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                     self.build_context
                         .source_tree_editable_policy()
                         .workspace_member_editable(None),
+                    self.build_context.cache(),
                     self.build_context.workspace_cache(),
                     credentials_cache,
                 )
@@ -2480,6 +2488,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
                 self.build_context
                     .source_tree_editable_policy()
                     .workspace_member_editable(None),
+                self.build_context.cache(),
                 self.build_context.workspace_cache(),
                 credentials_cache,
             )

diff --git a/crates/uv-workspace/Cargo.toml b/crates/uv-workspace/Cargo.toml
@@ -17,6 +17,7 @@ workspace = true
 
 [dependencies]
 uv-build-backend = { workspace = true, features = ["schemars"] }
+uv-cache = { workspace = true }
 uv-cache-key = { workspace = true }
 uv-configuration = { workspace = true }
 uv-distribution-types = { workspace = true }
@@ -25,6 +26,7 @@ uv-fs = { workspace = true, features = ["tokio"] }
 uv-git-types = { workspace = true }
 uv-macros = { workspace = true }
 uv-normalize = { workspace = true }
+uv-once-map = { workspace = true }
 uv-options-metadata = { workspace = true }
 uv-pep440 = { workspace = true }
 uv-pep508 = { workspace = true }

diff --git a/crates/uv-workspace/src/lib.rs b/crates/uv-workspace/src/lib.rs
@@ -1,7 +1,6 @@
 pub use workspace::{
-    DiscoveryOptions, Editability, MemberDiscovery, ProjectDiscovery, ProjectWorkspace,
-    RequiresPythonSources, VirtualProject, Workspace, WorkspaceCache, WorkspaceError,
-    WorkspaceMember,
+    DiscoveryOptions, Editability, MemberDiscovery, ProjectWorkspace, RequiresPythonSources,
+    VirtualProject, Workspace, WorkspaceCache, WorkspaceError, WorkspaceErrorKind, WorkspaceMember,
 };
 
 pub mod dependency_groups;