Add conflict to map

Author: charliermarsh

crates/uv-distribution-types/src/resolution.rs

@@ -216,6 +216,7 @@ impl From<&ResolvedDist> for RequirementSource {
                         uv_pep440::VersionSpecifier::equals_version(version.clone()),
                     ),
                     index: Some(wheels.best_wheel().index.url().clone()),
+                    conflict: None,
                 },
                 Dist::Built(BuiltDist::DirectUrl(wheel)) => {
                     let mut location = wheel.url.to_url();
@@ -237,6 +238,7 @@ impl From<&ResolvedDist> for RequirementSource {
                         uv_pep440::VersionSpecifier::equals_version(sdist.version.clone()),
                     ),
                     index: Some(sdist.index.url().clone()),
+                    conflict: None,
                 },
                 Dist::Source(SourceDist::DirectUrl(sdist)) => {
                     let mut location = sdist.url.to_url();
@@ -272,6 +274,7 @@ impl From<&ResolvedDist> for RequirementSource {
                     uv_pep440::VersionSpecifier::equals_version(dist.version().clone()),
                 ),
                 index: None,
+                conflict: None,
             },
         }
     }

crates/uv-distribution/src/metadata/lowering.rs

@@ -13,7 +13,9 @@ use uv_git::GitReference;
 use uv_normalize::PackageName;
 use uv_pep440::VersionSpecifiers;
 use uv_pep508::{MarkerTree, VerbatimUrl, VersionOrUrl};
-use uv_pypi_types::{ParsedUrlError, Requirement, RequirementSource, VerbatimParsedUrl};
+use uv_pypi_types::{
+    ConflictItem, ParsedUrlError, Requirement, RequirementSource, VerbatimParsedUrl,
+};
 use uv_warnings::warn_user_once;
 use uv_workspace::pyproject::{PyProjectToml, Source, Sources};
 use uv_workspace::Workspace;
@@ -180,7 +182,7 @@ impl LoweredRequirement {
                         Source::Registry {
                             index,
                             marker,
-                            extra: _,
+                            extra,
                         } => {
                             // Identify the named index from either the project indexes or the workspace indexes,
                             // in that order.
@@ -199,8 +201,14 @@ impl LoweredRequirement {
                                     index,
                                 ));
                             };
-                            let source =
-                                registry_source(&requirement, index.into_url(), lower_bound)?;
+                            let conflict = extra
+                                .map(|extra| ConflictItem::from((project_name.clone(), extra)));
+                            let source = registry_source(
+                                &requirement,
+                                index.into_url(),
+                                conflict,
+                                lower_bound,
+                            )?;
                             (source, marker)
                         }
                         Source::Workspace {
@@ -423,8 +431,13 @@ impl LoweredRequirement {
                                     index,
                                 ));
                             };
-                            let source =
-                                registry_source(&requirement, index.into_url(), lower_bound)?;
+                            let conflict = None;
+                            let source = registry_source(
+                                &requirement,
+                                index.into_url(),
+                                conflict,
+                                lower_bound,
+                            )?;
                             (source, marker)
                         }
                         Source::Workspace { .. } => {
@@ -557,6 +570,7 @@ fn url_source(url: Url, subdirectory: Option<PathBuf>) -> Result<RequirementSour
 fn registry_source(
     requirement: &uv_pep508::Requirement<VerbatimParsedUrl>,
     index: Url,
+    conflict: Option<ConflictItem>,
     bounds: LowerBound,
 ) -> Result<RequirementSource, LoweringError> {
     match &requirement.version_or_url {
@@ -570,11 +584,13 @@ fn registry_source(
             Ok(RequirementSource::Registry {
                 specifier: VersionSpecifiers::empty(),
                 index: Some(index),
+                conflict,
             })
         }
         Some(VersionOrUrl::VersionSpecifier(version)) => Ok(RequirementSource::Registry {
             specifier: version.clone(),
             index: Some(index),
+            conflict,
         }),
         Some(VersionOrUrl::Url(_)) => Err(LoweringError::ConflictingUrls),
     }

crates/uv-distribution/src/metadata/mod.rs

@@ -90,6 +90,9 @@ impl Metadata {
             bounds,
         )
         .await?;
+        //
+        // println!("name: {:?}", name);
+        // println!("requires_dist: {:#?}", requires_dist);
 
         // Combine with the remaining metadata.
         Ok(Self {

crates/uv-pep508/src/marker/tree.rs

@@ -435,7 +435,7 @@ impl MarkerValueExtra {
     }
 
     /// Convert the [`MarkerValueExtra`] to an [`ExtraName`], if possible.
-    fn to_extra(self) -> Option<ExtraName> {
+    fn into_extra(self) -> Option<ExtraName> {
         match self {
             Self::Extra(extra) => Some(extra),
             Self::Arbitrary(_) => None,
@@ -1130,7 +1130,7 @@ impl MarkerTree {
         let extra_expression = self.top_level_extra()?;
 
         match extra_expression {
-            MarkerExpression::Extra { name, .. } => name.to_extra(),
+            MarkerExpression::Extra { name, .. } => name.into_extra(),
             _ => None,
         }
     }

crates/uv-pypi-types/src/requirement.rs

@@ -16,8 +16,8 @@ use uv_pep508::{
 };
 
 use crate::{
-    Hashes, ParsedArchiveUrl, ParsedDirectoryUrl, ParsedGitUrl, ParsedPathUrl, ParsedUrl,
-    ParsedUrlError, VerbatimParsedUrl,
+    ConflictItem, Hashes, ParsedArchiveUrl, ParsedDirectoryUrl, ParsedGitUrl, ParsedPathUrl,
+    ParsedUrl, ParsedUrlError, VerbatimParsedUrl,
 };
 
 #[derive(Debug, Error)]
@@ -192,11 +192,13 @@ impl From<uv_pep508::Requirement<VerbatimParsedUrl>> for Requirement {
             None => RequirementSource::Registry {
                 specifier: VersionSpecifiers::empty(),
                 index: None,
+                conflict: None,
             },
             // The most popular case: just a name, a version range and maybe extras.
             Some(VersionOrUrl::VersionSpecifier(specifier)) => RequirementSource::Registry {
                 specifier,
                 index: None,
+                conflict: None,
             },
             Some(VersionOrUrl::Url(url)) => {
                 RequirementSource::from_parsed_url(url.parsed_url, url.verbatim)
@@ -229,7 +231,9 @@ impl Display for Requirement {
             )?;
         }
         match &self.source {
-            RequirementSource::Registry { specifier, index } => {
+            RequirementSource::Registry {
+                specifier, index, ..
+            } => {
                 write!(f, "{specifier}")?;
                 if let Some(index) = index {
                     write!(f, " (index: {index})")?;
@@ -283,6 +287,8 @@ pub enum RequirementSource {
         specifier: VersionSpecifiers,
         /// Choose a version from the index at the given URL.
         index: Option<Url>,
+        /// The conflict item associated with the source, if any.
+        conflict: Option<ConflictItem>,
     },
     // TODO(konsti): Track and verify version specifier from `project.dependencies` matches the
     // version in remote location.
@@ -513,7 +519,9 @@ impl Display for RequirementSource {
     /// rather than for inclusion in a `requirements.txt` file.
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::Registry { specifier, index } => {
+            Self::Registry {
+                specifier, index, ..
+            } => {
                 write!(f, "{specifier}")?;
                 if let Some(index) = index {
                     write!(f, " (index: {index})")?;
@@ -571,6 +579,7 @@ enum RequirementSourceWire {
         #[serde(skip_serializing_if = "VersionSpecifiers::is_empty", default)]
         specifier: VersionSpecifiers,
         index: Option<Url>,
+        conflict: Option<ConflictItem>,
     },
 }
 
@@ -580,11 +589,16 @@ impl From<RequirementSource> for RequirementSourceWire {
             RequirementSource::Registry {
                 specifier,
                 mut index,
+                conflict,
             } => {
                 if let Some(index) = index.as_mut() {
                     redact_credentials(index);
                 }
-                Self::Registry { specifier, index }
+                Self::Registry {
+                    specifier,
+                    index,
+                    conflict,
+                }
             }
             RequirementSource::Url {
                 subdirectory,
@@ -686,9 +700,15 @@ impl TryFrom<RequirementSourceWire> for RequirementSource {
 
     fn try_from(wire: RequirementSourceWire) -> Result<RequirementSource, RequirementError> {
         match wire {
-            RequirementSourceWire::Registry { specifier, index } => {
-                Ok(Self::Registry { specifier, index })
-            }
+            RequirementSourceWire::Registry {
+                specifier,
+                index,
+                conflict,
+            } => Ok(Self::Registry {
+                specifier,
+                index,
+                conflict,
+            }),
             RequirementSourceWire::Git { git } => {
                 let mut repository = Url::parse(&git)?;
 

crates/uv-pypi-types/src/requirement/tests.rs

@@ -13,6 +13,7 @@ fn roundtrip() {
         source: RequirementSource::Registry {
             specifier: ">1,<2".parse().unwrap(),
             index: None,
+            conflict: None,
         },
         origin: None,
     };

crates/uv-resolver/src/lock/mod.rs

@@ -3757,6 +3757,7 @@ fn normalize_requirement(
         RequirementSource::Registry {
             specifier,
             mut index,
+            conflict,
         } => {
             if let Some(index) = index.as_mut() {
                 redact_credentials(index);
@@ -3765,7 +3766,11 @@ fn normalize_requirement(
                 name: requirement.name,
                 extras: requirement.extras,
                 marker: requirement.marker,
-                source: RequirementSource::Registry { specifier, index },
+                source: RequirementSource::Registry {
+                    specifier,
+                    index,
+                    conflict,
+                },
                 origin: None,
             })
         }

crates/uv-resolver/src/resolver/fork_map.rs

@@ -1,6 +1,6 @@
 use rustc_hash::FxHashMap;
 use uv_pep508::{MarkerTree, PackageName};
-use uv_pypi_types::{ConflictItemRef, Requirement};
+use uv_pypi_types::Requirement;
 
 use crate::ResolverEnvironment;
 
@@ -64,35 +64,4 @@ impl<T> ForkMap<T> {
             .map(|entry| &entry.value)
             .collect()
     }
-
-    /// Returns a list of values associated with a package that are compatible with the given fork.
-    ///
-    /// Compatibility implies that the markers on the requirement that contained this value
-    /// are not disjoint with the given fork. Note that this does not imply that the requirement
-    /// diverged in the given fork - values from overlapping forks may be combined.
-    pub(crate) fn get_without_conflicts(
-        &self,
-        name: &PackageName,
-        parent_name: Option<&PackageName>,
-        env: &ResolverEnvironment,
-    ) -> Vec<&T> {
-        let Some(values) = self.0.get(name) else {
-            return Vec::new();
-        };
-        values
-            .iter()
-            .filter(|entry| env.included_by_marker(&entry.marker))
-            .filter(|entry| {
-                let Some(parent_name) = parent_name else {
-                    return true;
-                };
-                let Some(extra) = entry.marker.top_level_extra_name() else {
-                    return true;
-                };
-                let group = ConflictItemRef::from((parent_name, &extra));
-                env.included_by_group(group)
-            })
-            .map(|entry| &entry.value)
-            .collect()
-    }
 }

crates/uv-resolver/src/resolver/indexes.rs

@@ -1,7 +1,7 @@
 use uv_distribution_types::IndexUrl;
 use uv_normalize::PackageName;
 use uv_pep508::VerbatimUrl;
-use uv_pypi_types::RequirementSource;
+use uv_pypi_types::{ConflictItem, RequirementSource};
 
 use crate::resolver::ForkMap;
 use crate::{DependencyMode, Manifest, ResolverEnvironment};
@@ -20,7 +20,13 @@ use crate::{DependencyMode, Manifest, ResolverEnvironment};
 ///
 /// [`Indexes`] would contain a single entry mapping `torch` to `https://download.pytorch.org/whl/cu121`.
 #[derive(Debug, Default, Clone)]
-pub(crate) struct Indexes(ForkMap<IndexUrl>);
+pub(crate) struct Indexes(ForkMap<Entry>);
+
+#[derive(Debug, Clone)]
+struct Entry {
+    index: IndexUrl,
+    conflict: Option<ConflictItem>,
+}
 
 impl Indexes {
     /// Determine the set of explicit, pinned indexes in the [`Manifest`].
@@ -33,13 +39,16 @@ impl Indexes {
 
         for requirement in manifest.requirements(env, dependencies) {
             let RequirementSource::Registry {
-                index: Some(index), ..
+                index: Some(index),
+                conflict,
+                ..
             } = &requirement.source
             else {
                 continue;
             };
             let index = IndexUrl::from(VerbatimUrl::from_url(index.clone()));
-            indexes.add(&requirement, index);
+            let conflict = conflict.clone();
+            indexes.add(&requirement, Entry { index, conflict });
         }
 
         Self(indexes)
@@ -51,12 +60,17 @@ impl Indexes {
     }
 
     /// Return the explicit index used for a package in the given fork.
-    pub(crate) fn get(
-        &self,
-        name: &PackageName,
-        parent: Option<&PackageName>,
-        env: &ResolverEnvironment,
-    ) -> Vec<&IndexUrl> {
-        self.0.get_without_conflicts(name, parent, env)
+    pub(crate) fn get(&self, name: &PackageName, env: &ResolverEnvironment) -> Vec<&IndexUrl> {
+        let entries = self.0.get(name, env);
+        entries
+            .iter()
+            .filter(|entry| {
+                entry
+                    .conflict
+                    .as_ref()
+                    .map_or(true, |conflict| env.included_by_group(conflict.as_ref()))
+            })
+            .map(|entry| &entry.index)
+            .collect()
     }
 }

crates/uv-resolver/src/resolver/mod.rs

@@ -2256,7 +2256,7 @@ impl ForkState {
                 };
 
                 // If the package is pinned to an exact index, add it to the fork.
-                for index in indexes.get(name, self.next.name_no_root(), &self.env) {
+                for index in indexes.get(name, &self.env) {
                     self.fork_indexes.insert(name, index, &self.env)?;
                 }
             }