feat: Add support for optional dependencies

crates/rattler_conda_types/src/lib.rs

@@ -27,7 +27,7 @@ pub mod prefix_record;
 #[cfg(test)]
 use std::path::{Path, PathBuf};
 
-pub use build_spec::{BuildNumber, BuildNumberSpec, ParseBuildNumberSpecError};
+pub use build_spec::{BuildNumber, BuildNumberSpec, OrdOperator, ParseBuildNumberSpecError};
 pub use channel::{Channel, ChannelConfig, ChannelUrl, NamedChannelOrUrl, ParseChannelError};
 pub use channel_data::{ChannelData, ChannelDataPackage};
 pub use environment_yaml::{EnvironmentYaml, MatchSpecOrSubSection};

crates/rattler_conda_types/src/match_spec/matcher.rs

@@ -41,6 +41,12 @@ impl PartialEq for StringMatcher {
     }
 }
 
+impl From<String> for StringMatcher {
+    fn from(s: String) -> Self {
+        StringMatcher::Exact(s)
+    }
+}
+
 impl StringMatcher {
     /// Match string against [`StringMatcher`].
     pub fn matches(&self, other: &str) -> bool {

crates/rattler_conda_types/src/match_spec/mod.rs

@@ -132,6 +132,8 @@ pub struct MatchSpec {
     pub build_number: Option<BuildNumberSpec>,
     /// Match the specific filename of the package
     pub file_name: Option<String>,
+    /// The selected optional features of the package
+    pub optional_features: Option<Vec<String>>,
     /// The channel of the package
     pub channel: Option<Arc<Channel>>,
     /// The subdir of the channel
@@ -170,6 +172,20 @@ impl Display for MatchSpec {
             None => write!(f, "*")?,
         }
 
+        match &self.optional_features {
+            Some(dependencies) => {
+                write!(f, "[")?;
+                for (i, dep) in dependencies.iter().enumerate() {
+                    if i > 0 {
+                        write!(f, ", ")?;
+                    }
+                    write!(f, "{dep}")?;
+                }
+                write!(f, "]")?;
+            }
+            None => {}
+        }
+
         if let Some(version) = &self.version {
             write!(f, " {version}")?;
         }
@@ -218,6 +234,7 @@ impl MatchSpec {
                 build: self.build,
                 build_number: self.build_number,
                 file_name: self.file_name,
+                optional_features: self.optional_features,
                 channel: self.channel,
                 subdir: self.subdir,
                 namespace: self.namespace,
@@ -255,6 +272,8 @@ pub struct NamelessMatchSpec {
     pub build_number: Option<BuildNumberSpec>,
     /// Match the specific filename of the package
     pub file_name: Option<String>,
+    /// The selected optional features of the package
+    pub optional_features: Option<Vec<String>>,
     /// The channel of the package
     #[serde(deserialize_with = "deserialize_channel", default)]
     pub channel: Option<Arc<Channel>>,
@@ -308,6 +327,7 @@ impl From<MatchSpec> for NamelessMatchSpec {
             build: spec.build,
             build_number: spec.build_number,
             file_name: spec.file_name,
+            optional_features: spec.optional_features,
             channel: spec.channel,
             subdir: spec.subdir,
             namespace: spec.namespace,
@@ -327,6 +347,7 @@ impl MatchSpec {
             build: spec.build,
             build_number: spec.build_number,
             file_name: spec.file_name,
+            optional_features: spec.optional_features,
             channel: spec.channel,
             subdir: spec.subdir,
             namespace: spec.namespace,

crates/rattler_conda_types/src/match_spec/parse.rs

@@ -4,7 +4,7 @@ use nom::{
     branch::alt,
     bytes::complete::{tag, take_till1, take_until, take_while, take_while1},
     character::complete::{char, multispace0, one_of, space0},
-    combinator::{opt, recognize},
+    combinator::{map, opt, recognize},
     error::{context, ContextError, ParseError},
     multi::{separated_list0, separated_list1},
     sequence::{delimited, preceded, separated_pair, terminated},
@@ -178,6 +178,7 @@ fn parse_bracket_list(input: &str) -> Result<BracketVec<'_>, ParseMatchSpecError
             alt((
                 delimited(char('"'), take_until("\""), char('"')),
                 delimited(char('\''), take_until("'"), char('\'')),
+                delimited(char('['), take_until("]"), char(']')),
                 take_till1(|c| c == ',' || c == ']' || c == '\'' || c == '"'),
             )),
         ))(input)
@@ -207,7 +208,9 @@ fn parse_bracket_list(input: &str) -> Result<BracketVec<'_>, ParseMatchSpecError
 /// Strips the brackets part of the matchspec returning the rest of the
 /// matchspec and  the contents of the brackets as a `Vec<&str>`.
 fn strip_brackets(input: &str) -> Result<(Cow<'_, str>, BracketVec<'_>), ParseMatchSpecError> {
-    if let Some(matches) = lazy_regex::regex!(r#".*(?:(\[.*\]))$"#).captures(input) {
+    if let Some(matches) =
+        lazy_regex::regex!(r#".*(\[(?:[^\[\]]|\[(?:[^\[\]]|\[.*\])*\])*\])$"#).captures(input)
+    {
         let bracket_str = matches.get(1).unwrap().as_str();
         let bracket_contents = parse_bracket_list(bracket_str)?;
 
@@ -223,6 +226,23 @@ fn strip_brackets(input: &str) -> Result<(Cow<'_, str>, BracketVec<'_>), ParseMa
     }
 }
 
+/// Parses a list of optional dependencies from a string `[feat1, feat2, feat3]`.
+pub fn parse_optional_features(input: &str) -> Result<Vec<String>, ParseMatchSpecError> {
+    fn parse_features(input: &str) -> IResult<&str, Vec<String>> {
+        separated_list0(
+            char(','),
+            map(take_till1(|c| c == ',' || c == ']'), |s: &str| {
+                s.trim().to_string()
+            }),
+        )(input)
+    }
+
+    match parse_features(input).finish() {
+        Ok((_remaining, dependencies)) => Ok(dependencies),
+        Err(_) => Err(ParseMatchSpecError::InvalidBracket),
+    }
+}
+
 /// Parses a [`BracketVec`] into precise components
 fn parse_bracket_vec_into_components(
     bracket: BracketVec<'_>,
@@ -248,6 +268,9 @@ fn parse_bracket_vec_into_components(
             "version" => match_spec.version = Some(VersionSpec::from_str(value, strictness)?),
             "build" => match_spec.build = Some(StringMatcher::from_str(value)?),
             "build_number" => match_spec.build_number = Some(BuildNumberSpec::from_str(value)?),
+            "optional_features" => {
+                match_spec.optional_features = Some(parse_optional_features(value)?);
+            }
             "sha256" => {
                 match_spec.sha256 = Some(
                     parse_digest_from_hex::<Sha256>(value)
@@ -1342,6 +1365,7 @@ mod tests {
             build: "py27_0*".parse().ok(),
             build_number: Some(BuildNumberSpec::from_str(">=6").unwrap()),
             file_name: Some("foo-1.0-py27_0.tar.bz2".to_string()),
+            optional_features: None,
             channel: Some(
                 Channel::from_str("conda-forge", &channel_config())
                     .map(Arc::new)

crates/rattler_conda_types/src/repo_data/mod.rs

@@ -6,7 +6,7 @@ pub mod sharded;
 mod topological_sort;
 
 use std::{
-    collections::BTreeSet,
+    collections::{BTreeMap, BTreeSet},
     fmt::{Display, Formatter},
     path::Path,
 };
@@ -146,6 +146,11 @@ pub struct PackageRecord {
     #[serde(skip_serializing_if = "NoArchType::is_none")]
     pub noarch: NoArchType,
 
+    /// Specifications of optional or dependencies. These are dependencies that are
+    /// only required if certain features are enabled or if certain conditions are met.
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub optional_depends: BTreeMap<String, Vec<String>>,
+
     /// Optionally the platform the package supports
     pub platform: Option<String>, // Note that this does not match the [`Platform`] enum..
 
@@ -323,6 +328,7 @@ impl PackageRecord {
             noarch: NoArchType::default(),
             platform: None,
             python_site_packages_path: None,
+            optional_depends: BTreeMap::new(),
             sha256: None,
             size: None,
             subdir: Platform::current().to_string(),
@@ -511,6 +517,7 @@ impl PackageRecord {
             noarch: index.noarch,
             platform: index.platform,
             python_site_packages_path: index.python_site_packages_path,
+            optional_depends: BTreeMap::new(),
             sha256,
             size,
             subdir,

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__libsqlite-3_40_0-hcfcfb64_0_json.snap

@@ -55,4 +55,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\envs\\conda\\pkgs\\libsqlite-3.40.0-hcfcfb64_0"
   type: 1
 requested_spec: "conda-forge/win-64::libsqlite==3.40.0=hcfcfb64_0[md5=5e5a97795de72f8cc3baf3d9ea6327a2]"
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__menuinst-1_4_19-py311h1ea47a8_1_json.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/prefix_record.rs
-assertion_line: 266
 expression: prefix_record
 ---
 arch: x86_64
@@ -229,4 +228,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\pkgs\\menuinst-1.4.19-py311h1ea47a8_1"
   type: 1
 requested_spec: ""
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__pip-23_0-pyhd8ed1ab_0_json.snap

@@ -4552,4 +4552,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\envs\\conda\\pkgs\\pip-23.0-pyhd8ed1ab_0"
   type: 1
 requested_spec: "conda-forge/noarch::pip==23.0=pyhd8ed1ab_0[md5=85b35999162ec95f9f999bac15279c02]"
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__pysocks-1_7_1-pyh0701188_6_json.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/prefix_record.rs
-assertion_line: 266
 expression: prefix_record
 ---
 build: pyh0701188_6
@@ -98,4 +97,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\pkgs\\pysocks-1.7.1-pyh0701188_6"
   type: 1
 requested_spec: ""
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__requests-2_28_2-pyhd8ed1ab_0_json.snap

@@ -244,4 +244,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\pkgs\\requests-2.28.2-pyhd8ed1ab_0"
   type: 1
 requested_spec: ""
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__tk-8_6_12-h8ffe710_0_json.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_conda_types/src/prefix_record.rs
-assertion_line: 344
 expression: prefix_record
 ---
 arch: x86_64

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__urllib3-1_26_14-pyhd8ed1ab_0_json.snap

@@ -421,4 +421,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\pkgs\\urllib3-1.26.14-pyhd8ed1ab_0"
   type: 1
 requested_spec: ""
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__vc-14_3-hb6edc58_10_json.snap

@@ -31,4 +31,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\envs\\conda\\pkgs\\vc-14.3-hb6edc58_10"
   type: 1
 requested_spec: "conda-forge/win-64::vc==14.3=hb6edc58_10[md5=52d246d8d14b83c516229be5bb03a163]"
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__wheel-0_38_4-pyhd8ed1ab_0_json.snap

@@ -230,4 +230,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\envs\\conda\\pkgs\\wheel-0.38.4-pyhd8ed1ab_0"
   type: 1
 requested_spec: "conda-forge/noarch::wheel==0.38.4=pyhd8ed1ab_0[md5=c829cfb8cb826acb9de0ac1a2df0a940]"
-

crates/rattler_conda_types/src/snapshots/rattler_conda_types__prefix_record__test__xz-5_2_6-h8d14728_0_json.snap

@@ -157,4 +157,3 @@ link:
   source: "C:\\Users\\bas\\micromamba\\pkgs\\xz-5.2.6-h8d14728_0"
   type: 1
 requested_spec: ""
-

crates/rattler_index/src/lib.rs

@@ -40,6 +40,7 @@ pub fn package_record_from_index_json<T: Read>(
         arch: index.arch,
         platform: index.platform,
         depends: index.depends,
+        optional_depends: std::collections::BTreeMap::new(),
         constrains: index.constrains,
         track_features: index.track_features,
         features: index.features,

crates/rattler_lock/src/parse/models/v5/conda_package_data.rs

@@ -117,6 +117,7 @@ impl<'a> From<CondaPackageDataModel<'a>> for CondaPackageData {
                 build_number: value.build_number,
                 constrains: value.constrains.into_owned(),
                 depends: value.depends.into_owned(),
+                optional_depends: std::collections::BTreeMap::new(),
                 features: value.features.into_owned(),
                 legacy_bz2_md5: value.legacy_bz2_md5,
                 legacy_bz2_size: value.legacy_bz2_size.into_owned(),

crates/rattler_lock/src/parse/models/v6/conda_package_data.rs

@@ -1,4 +1,7 @@
-use std::{borrow::Cow, collections::BTreeSet};
+use std::{
+    borrow::Cow,
+    collections::{BTreeMap, BTreeSet},
+};
 
 use rattler_conda_types::{
     package::ArchiveIdentifier, BuildNumber, ChannelUrl, NoArchType, PackageName, PackageRecord,
@@ -73,6 +76,8 @@ pub(crate) struct CondaPackageDataModel<'a> {
     pub depends: Cow<'a, Vec<String>>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub constrains: Cow<'a, Vec<String>>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub optional_depends: Cow<'a, BTreeMap<String, Vec<String>>>,
 
     // Additional properties (in semi alphabetic order but grouped by commonality)
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -157,6 +162,7 @@ impl<'a> TryFrom<CondaPackageDataModel<'a>> for CondaPackageData {
             build_number,
             constrains: value.constrains.into_owned(),
             depends: value.depends.into_owned(),
+            optional_depends: value.optional_depends.into_owned(),
             features: value.features.into_owned(),
             legacy_bz2_md5: value.legacy_bz2_md5,
             legacy_bz2_size: value.legacy_bz2_size.into_owned(),
@@ -273,6 +279,7 @@ impl<'a> From<&'a CondaPackageData> for CondaPackageDataModel<'a> {
             purls: Cow::Borrowed(&package_record.purls),
             depends: Cow::Borrowed(&package_record.depends),
             constrains: Cow::Borrowed(&package_record.constrains),
+            optional_depends: Cow::Borrowed(&package_record.optional_depends),
             arch: (package_record.arch != arch).then_some(Cow::Owned(arch)),
             platform: (package_record.platform != platform).then_some(Cow::Owned(platform)),
             md5: package_record.md5,

crates/rattler_lock/src/parse/v3.rs

@@ -202,6 +202,7 @@ pub fn parse_v3_or_lower(
                             build_number,
                             constrains: value.constrains,
                             depends: value.dependencies,
+                            optional_depends: std::collections::BTreeMap::new(),
                             features: value.features,
                             legacy_bz2_md5: None,
                             legacy_bz2_size: None,

crates/rattler_repodata_gateway/src/gateway/query.rs

@@ -265,6 +265,15 @@ impl RepoDataQuery {
                                     pending_package_specs.insert(dependency_name.clone(), SourceSpecs::Transitive);
                                 }
                             }
+
+                            for (_, dependencies) in record.package_record.optional_depends.iter() {
+                                for dependency in dependencies {
+                                    let dependency_name = PackageName::new_unchecked(dependency.split_once(' ').unwrap_or((dependency, "")).0);
+                                    if seen.insert(dependency_name.clone()) {
+                                        pending_package_specs.insert(dependency_name.clone(), SourceSpecs::Transitive);
+                                    }
+                                }
+                            }
                         }
                     }
 

crates/rattler_solve/src/lib.rs

@@ -97,7 +97,7 @@ pub enum ChannelPriority {
     /// precedence.
     Disabled,
 }
-
+#[derive(Debug, Clone, PartialEq, Eq)]
 /// Represents a dependency resolution task, to be solved by one of the backends
 pub struct SolverTask<TAvailablePackagesIterator> {
     /// An iterator over all available packages

crates/rattler_solve/src/resolvo/conda_sorting.rs

@@ -10,7 +10,7 @@ use resolvo::{
     utils::Pool, Dependencies, NameId, Requirement, SolvableId, SolverCache, VersionSetId,
 };
 
-use super::{SolverMatchSpec, SolverPackageRecord};
+use super::{NameType, SolverMatchSpec, SolverPackageRecord};
 use crate::resolvo::CondaDependencyProvider;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -52,7 +52,7 @@ impl<'a, 'repo> SolvableSorter<'a, 'repo> {
     }
 
     /// Referece to the pool
-    fn pool(&self) -> &Pool<SolverMatchSpec<'repo>> {
+    fn pool(&self) -> &Pool<SolverMatchSpec<'repo>, NameType> {
         &self.solver.provider().pool
     }