py-rattler 0.13.1__tar.gz → 0.14.0__tar.gz

{py_rattler-0.13.1 → py_rattler-0.14.0}/Cargo.toml

@@ -52,7 +52,7 @@ chrono = { version = "0.4.41", default-features = false, features = [
   "alloc",
 ] }
 clap = { version = "4.5.38", features = ["derive"] }
-clap-verbosity-flag = "3.0.2"
+clap-verbosity-flag = "3.0.3"
 cmake = "0.1.54"
 console = { version = "0.15.11", features = ["windows-console-colors"] }
 criterion = "0.5"
@@ -105,7 +105,7 @@ memmap2 = "0.9.5"
 netrc-rs = "0.1.2"
 nom = "7.1.3"
 num_cpus = "1.16.0"
-opendal = { version = "0.53.2", default-features = false }
+opendal = { version = "0.53.3", default-features = false }
 once_cell = "1.21.3"
 parking_lot = "0.12.3"
 pathdiff = "0.2.3"
@@ -157,7 +157,7 @@ tempfile = "3.20.0"
 temp-env = { version = "0.3.6", features = ["async_closure"] }
 test-log = "0.2.17"
 thiserror = "2.0"
-tokio = { version = "1.45.0", default-features = false }
+tokio = { version = "1.45.1", default-features = false }
 tokio-stream = "0.1.17"
 tokio-util = "0.7.15"
 tower = { version = "0.5.2", default-features = false }
@@ -169,7 +169,7 @@ trybuild = { version = "1.0.105" }
 typed-path = { version = "0.11.0" }
 url = { version = "2.5.4" }
 unicode-normalization = "0.1.24"
-uuid = { version = "1.16.0", default-features = false }
+uuid = { version = "1.17.0", default-features = false }
 walkdir = "2.5.0"
 wasmtimer = "0.4.1"
 which = "7.0.3"
@@ -180,24 +180,24 @@ zstd = { version = "0.13.3", default-features = false }
 
 # These are the all the crates defined in the workspace. We pin all of them together because they are always updated in tendem.
 file_url = { path = "crates/file_url", version = "=0.2.5", default-features = false }
-rattler = { path = "crates/rattler", version = "=0.33.7", default-features = false }
-rattler_cache = { path = "crates/rattler_cache", version = "=0.3.19", default-features = false }
-rattler_conda_types = { path = "crates/rattler_conda_types", version = "=0.34.0", default-features = false }
+rattler = { path = "crates/rattler", version = "=0.34.0", default-features = false }
+rattler_cache = { path = "crates/rattler_cache", version = "=0.3.20", default-features = false }
+rattler_conda_types = { path = "crates/rattler_conda_types", version = "=0.35.0", default-features = false }
 rattler_digest = { path = "crates/rattler_digest", version = "=1.1.2", default-features = false }
-rattler_index = { path = "crates/rattler_index", version = "=0.22.7", default-features = false }
+rattler_index = { path = "crates/rattler_index", version = "=0.23.0", default-features = false }
 rattler_libsolv_c = { path = "crates/rattler_libsolv_c", version = "=1.2.1", default-features = false }
-rattler_lock = { path = "crates/rattler_lock", version = "=0.23.4", default-features = false }
+rattler_lock = { path = "crates/rattler_lock", version = "=0.23.5", default-features = false }
 rattler_macros = { path = "crates/rattler_macros", version = "=1.0.9", default-features = false }
-rattler_menuinst = { path = "crates/rattler_menuinst", version = "=0.2.9", default-features = false }
-rattler_networking = { path = "crates/rattler_networking", version = "=0.24.0", default-features = false }
+rattler_menuinst = { path = "crates/rattler_menuinst", version = "=0.2.10", default-features = false }
+rattler_networking = { path = "crates/rattler_networking", version = "=0.25.0", default-features = false }
 rattler_pty = { path = "crates/rattler_pty", version = "=0.2.1", default-features = false }
 rattler_redaction = { path = "crates/rattler_redaction", version = "=0.1.10", default-features = false }
-rattler_package_streaming = { path = "crates/rattler_package_streaming", version = "=0.22.38", default-features = false }
-rattler_repodata_gateway = { path = "crates/rattler_repodata_gateway", version = "=0.22.7", default-features = false }
+rattler_package_streaming = { path = "crates/rattler_package_streaming", version = "=0.22.39", default-features = false }
+rattler_repodata_gateway = { path = "crates/rattler_repodata_gateway", version = "=0.23.0", default-features = false }
 rattler_sandbox = { path = "crates/rattler_sandbox", version = "=0.1.8", default-features = false }
-rattler_shell = { path = "crates/rattler_shell", version = "=0.23.1", default-features = false }
-rattler_solve = { path = "crates/rattler_solve", version = "=2.0.0", default-features = false }
-rattler_virtual_packages = { path = "crates/rattler_virtual_packages", version = "=2.0.12", default-features = false }
+rattler_shell = { path = "crates/rattler_shell", version = "=0.23.2", default-features = false }
+rattler_solve = { path = "crates/rattler_solve", version = "=2.1.0", default-features = false }
+rattler_virtual_packages = { path = "crates/rattler_virtual_packages", version = "=2.0.13", default-features = false }
 
 # This is also a rattler crate, but we only pin it to minor version
 simple_spawn_blocking = { path = "crates/simple_spawn_blocking", version = "1.1", default-features = false }

{py_rattler-0.13.1 → py_rattler-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-rattler
-Version: 0.13.1
+Version: 0.14.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.34.0](https://github.com/conda/rattler/compare/rattler-v0.33.7...rattler-v0.34.0) - 2025-05-23
+
+### Fixed
+
+- consistent usage of rustls-tls / native-tls feature ([#1324](https://github.com/conda/rattler/pull/1324))
+
 ## [0.33.7](https://github.com/conda/rattler/compare/rattler-v0.33.6...rattler-v0.33.7) - 2025-05-16
 
 ### Other

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler"
-version = "0.33.7"
+version = "0.34.0"
 edition.workspace = true
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "Rust library to install conda environments"

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_cache/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.20](https://github.com/conda/rattler/compare/rattler_cache-v0.3.19...rattler_cache-v0.3.20) - 2025-05-23
+
+### Fixed
+
+- consistent usage of rustls-tls / native-tls feature ([#1324](https://github.com/conda/rattler/pull/1324))
+
 ## [0.3.19](https://github.com/conda/rattler/compare/rattler_cache-v0.3.18...rattler_cache-v0.3.19) - 2025-05-16
 
 ### Other

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_cache/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_cache"
-version = "0.3.19"
+version = "0.3.20"
 description = "A crate to manage the caching of data in rattler"
 categories = { workspace = true }
 homepage = { workspace = true }

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_conda_types/CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.35.0](https://github.com/conda/rattler/compare/rattler_conda_types-v0.34.0...rattler_conda_types-v0.35.0) - 2025-05-23
+
+### Added
+
+- Sharded repodata, zst, add purls and run_exports support ([#1312](https://github.com/conda/rattler/pull/1312))
+- control over selection of .conda and .tar.bz2 ([#1344](https://github.com/conda/rattler/pull/1344))
+
+### Fixed
+
+- *(py)* package count was incorrect for prefer-conda ([#1350](https://github.com/conda/rattler/pull/1350))
+- add missing `created_at` in shards ([#1343](https://github.com/conda/rattler/pull/1343))
+- properly dedup package names ([#1342](https://github.com/conda/rattler/pull/1342))
+
 ## [0.34.0](https://github.com/conda/rattler/compare/rattler_conda_types-v0.33.0...rattler_conda_types-v0.34.0) - 2025-05-16
 
 ### Added

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_conda_types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_conda_types"
-version = "0.34.0"
+version = "0.35.0"
 edition.workspace = true
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "Rust data types for common types used within the Conda ecosystem"

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_conda_types/src/repo_data/sharded.rs

@@ -44,7 +44,7 @@ pub struct ShardedSubdirInfo {
 }
 
 /// An individual shard that contains repodata for a single package name.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct Shard {
     /// The records for all `.tar.bz2` packages
     pub packages: FxHashMap<String, PackageRecord>,

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_index/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.23.0](https://github.com/conda/rattler/compare/rattler_index-v0.22.7...rattler_index-v0.23.0) - 2025-05-23
+
+### Added
+
+- Sharded repodata, zst, add purls and run_exports support ([#1312](https://github.com/conda/rattler/pull/1312))
+
 ## [0.22.7](https://github.com/conda/rattler/compare/rattler_index-v0.22.6...rattler_index-v0.22.7) - 2025-05-16
 
 ### Added

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_index/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_index"
-version = "0.22.7"
+version = "0.23.0"
 edition.workspace = true
 authors = []
 description = "A crate to index conda channels and create a repodata.json file."
@@ -33,6 +33,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = { workspace = true }
 bytes = { workspace = true }
+chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "env"] }
 clap-verbosity-flag = { workspace = true, features = ["tracing"] }
 console = { workspace = true }
@@ -53,11 +54,16 @@ reqwest = { workspace = true, default-features = false, features = [
   "macos-system-configuration",
   "charset",
 ] }
+rmp-serde = { workspace = true }
+serde = { workspace = true }
 serde_json = { workspace = true }
+sha2 = { workspace = true }
+tar = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
 url = { workspace = true }
+zstd = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }

{py_rattler-0.13.1 → py_rattler-0.14.0}/crates/rattler_index/src/lib.rs

@@ -9,14 +9,18 @@ use futures::{stream::FuturesUnordered, StreamExt};
 use fxhash::FxHashMap;
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use rattler_conda_types::{
-    package::{ArchiveType, IndexJson, PackageFile},
-    ChannelInfo, PackageRecord, PatchInstructions, Platform, RepoData,
+    package::{ArchiveIdentifier, ArchiveType, IndexJson, PackageFile, RunExportsJson},
+    ChannelInfo, PackageRecord, PatchInstructions, Platform, RepoData, Shard, ShardedRepodata,
+    ShardedSubdirInfo,
 };
+use rattler_digest::Sha256Hash;
 use rattler_networking::{Authentication, AuthenticationStorage};
 use rattler_package_streaming::{
     read,
     seek::{self, stream_conda_content},
 };
+use serde::Serialize;
+use sha2::{Digest, Sha256};
 use std::{
     collections::{HashMap, HashSet},
     io::{Cursor, Read, Seek},
@@ -33,6 +37,11 @@ use opendal::{
     Configurator, Operator,
 };
 
+const REPODATA_FROM_PACKAGES: &str = "repodata_from_packages.json";
+const REPODATA: &str = "repodata.json";
+const REPODATA_SHARDS: &str = "repodata_shards.msgpack.zst";
+const ZSTD_REPODATA_COMPRESSION_LEVEL: i32 = 19;
+
 /// Extract the package record from an `index.json` file.
 pub fn package_record_from_index_json<T: Read>(
     package_as_bytes: impl AsRef<[u8]>,
@@ -151,43 +160,61 @@ pub fn package_record_from_conda(file: &Path) -> std::io::Result<PackageRecord>
     package_record_from_conda_reader(reader)
 }
 
-/// Extract the package record from a `.conda` package file content.
-/// This function will look for the `info/index.json` file in the conda package
-/// and extract the package record from it.
-pub fn package_record_from_conda_reader(reader: impl Read) -> std::io::Result<PackageRecord> {
-    let bytes = reader.bytes().collect::<Result<Vec<u8>, _>>()?;
-    let reader = Cursor::new(&bytes);
-    let mut archive = seek::stream_conda_info(reader).expect("Could not open conda file");
-
+fn read_index_json_from_archive(
+    bytes: &Vec<u8>,
+    archive: &mut tar::Archive<impl Read>,
+) -> std::io::Result<PackageRecord> {
+    let mut index_json = None;
+    let mut run_exports_json = None;
     for entry in archive.entries()?.flatten() {
         let mut entry = entry;
         let path = entry.path()?;
         if path.as_os_str().eq("info/index.json") {
-            return package_record_from_index_json(&bytes, &mut entry);
+            index_json = Some(package_record_from_index_json(bytes, &mut entry)?);
+        } else if path.as_os_str().eq("info/run_exports.json") {
+            run_exports_json = Some(RunExportsJson::from_reader(&mut entry)?);
         }
     }
+
+    if let Some(mut index_json) = index_json {
+        index_json.run_exports = run_exports_json;
+        return Ok(index_json);
+    }
+
     Err(std::io::Error::new(
         std::io::ErrorKind::Other,
         "No index.json found",
     ))
 }
 
+/// Extract the package record from a `.conda` package file content.
+/// This function will look for the `info/index.json` file in the conda package
+/// and extract the package record from it.
+pub fn package_record_from_conda_reader(reader: impl Read) -> std::io::Result<PackageRecord> {
+    let bytes = reader.bytes().collect::<Result<Vec<u8>, _>>()?;
+    let reader = Cursor::new(&bytes);
+    let mut archive = seek::stream_conda_info(reader).expect("Could not open conda file");
+    read_index_json_from_archive(&bytes, &mut archive)
+}
+
+#[allow(clippy::too_many_arguments)]
 async fn index_subdir(
     subdir: Platform,
     op: Operator,
     force: bool,
+    write_zst: bool,
+    write_shards: bool,
     repodata_patch: Option<PatchInstructions>,
     progress: Option<MultiProgress>,
     semaphore: Arc<Semaphore>,
 ) -> Result<()> {
-    let repodata_path = if repodata_patch.is_some() {
-        format!("{subdir}/repodata_from_packages.json")
-    } else {
-        format!("{subdir}/repodata.json")
-    };
     let mut registered_packages: FxHashMap<String, PackageRecord> = HashMap::default();
     if !force {
-        let repodata_bytes = op.read(&repodata_path).await;
+        let repodata_bytes = if repodata_patch.is_some() {
+            op.read(&format!("{subdir}/{REPODATA_FROM_PACKAGES}")).await
+        } else {
+            op.read(&format!("{subdir}/{REPODATA}")).await
+        };
         let repodata: RepoData = match repodata_bytes {
             Ok(bytes) => serde_json::from_slice(&bytes.to_vec())?,
             Err(e) => {
@@ -368,6 +395,7 @@ async fn index_subdir(
         }
     }
 
+    // TODO: don't serialize run_exports and purls but in their own files
     let repodata = RepoData {
         info: Some(ChannelInfo {
             subdir: Some(subdir.to_string()),
@@ -379,41 +407,187 @@ async fn index_subdir(
         version: Some(2),
     };
 
-    tracing::info!("Writing repodata to {}", repodata_path);
-    let repodata_bytes = serde_json::to_vec(&repodata)?;
-    op.write(&repodata_path, repodata_bytes).await?;
+    write_repodata(
+        repodata,
+        repodata_patch,
+        write_zst,
+        write_shards,
+        subdir,
+        op,
+    )
+    .await
+}
+
+fn serialize_msgpack_zst<T>(val: &T) -> Result<Vec<u8>>
+where
+    T: Serialize + ?Sized,
+{
+    let msgpack = rmp_serde::to_vec_named(val)?;
+    let encoded = zstd::stream::encode_all(&msgpack[..], 0)?;
+    Ok(encoded)
+}
 
-    if let Some(instructions) = repodata_patch {
-        let patched_repodata_path = format!("{subdir}/repodata.json");
-        tracing::info!("Writing patched repodata to {}", patched_repodata_path);
+/// Write a `repodata.json` for all packages in the given configurator's root.
+pub async fn write_repodata(
+    repodata: RepoData,
+    repodata_patch: Option<PatchInstructions>,
+    write_zst: bool,
+    write_shards: bool,
+    subdir: Platform,
+    op: Operator,
+) -> Result<()> {
+    if repodata_patch.is_some() {
+        let unpatched_repodata_path = format!("{subdir}/{REPODATA_FROM_PACKAGES}");
+        tracing::info!("Writing unpatched repodata to {unpatched_repodata_path}");
+        let unpatched_repodata_bytes = serde_json::to_vec(&repodata)?;
+        op.write(&unpatched_repodata_path, unpatched_repodata_bytes)
+            .await?;
+    }
+
+    let repodata = if let Some(instructions) = repodata_patch {
+        tracing::info!("Patching repodata");
         let mut patched_repodata = repodata.clone();
         patched_repodata.apply_patches(&instructions);
-        let patched_repodata_bytes = serde_json::to_vec(&patched_repodata)?;
-        op.write(&patched_repodata_path, patched_repodata_bytes)
-            .await?;
+        patched_repodata
+    } else {
+        repodata
+    };
+
+    let repodata_bytes = serde_json::to_vec(&repodata)?;
+    if write_zst {
+        tracing::info!("Compressing repodata bytes");
+        let repodata_zst_bytes =
+            zstd::stream::encode_all(&repodata_bytes[..], ZSTD_REPODATA_COMPRESSION_LEVEL)?;
+        let repodata_zst_path = format!("{subdir}/{REPODATA}.zst");
+        tracing::info!("Writing zst repodata to {repodata_zst_path}");
+        op.write(&repodata_zst_path, repodata_zst_bytes).await?;
     }
-    // todo: also write repodata.json.bz2, repodata.json.zst, repodata.json.jlap and sharded repodata once available in rattler
-    // https://github.com/conda/rattler/issues/1096
 
+    let repodata_path = format!("{subdir}/{REPODATA}");
+    tracing::info!("Writing repodata to {repodata_path}");
+    op.write(&repodata_path, repodata_bytes).await?;
+
+    if write_shards {
+        // See CEP 16 <https://github.com/conda/ceps/blob/main/cep-0016.md>
+        tracing::info!("Creating sharded repodata");
+        let mut shards_by_package_names: HashMap<String, Shard> = HashMap::new();
+        for (k, package_record) in repodata.conda_packages {
+            let package_name = package_record.name.as_normalized();
+            let shard = shards_by_package_names
+                .entry(package_name.into())
+                .or_default();
+            shard.conda_packages.insert(k, package_record);
+        }
+        for (k, package_record) in repodata.packages {
+            let package_name = package_record.name.as_normalized();
+            let shard = shards_by_package_names
+                .entry(package_name.into())
+                .or_default();
+            shard.packages.insert(k, package_record);
+        }
+        for package in repodata.removed {
+            let package_name = ArchiveIdentifier::try_from_filename(package.as_str())
+                .context("Could not determine archive identifier for {package}")?
+                .name;
+            let shard = shards_by_package_names.entry(package_name).or_default();
+            shard.removed.insert(package);
+        }
+
+        // calculate digests for shards
+        let shards = shards_by_package_names
+            .iter()
+            .map(|(k, shard)| {
+                serialize_msgpack_zst(shard).map(|encoded| {
+                    let mut hasher = Sha256::new();
+                    hasher.update(&encoded);
+                    let digest: Sha256Hash = hasher.finalize();
+                    (k, (digest, encoded))
+                })
+            })
+            .collect::<Result<HashMap<_, _>>>()?;
+
+        let sharded_repodata = ShardedRepodata {
+            info: ShardedSubdirInfo {
+                subdir: subdir.to_string(),
+                base_url: "".into(),
+                shards_base_url: "./shards/".into(),
+                created_at: Some(chrono::Utc::now()),
+            },
+            shards: shards
+                .iter()
+                .map(|(&k, (digest, _))| (k.clone(), *digest))
+                .collect(),
+        };
+
+        let mut tasks = FuturesUnordered::new();
+        // todo max parallel
+        for (_, (digest, encoded_shard)) in shards {
+            let op = op.clone();
+            let future = async move || {
+                let shard_path = format!("{subdir}/shards/{digest:x}.msgpack.zst");
+                tracing::trace!("Writing repodata shard to {shard_path}");
+                op.write(&shard_path, encoded_shard).await
+            };
+            tasks.push(tokio::spawn(future()));
+        }
+        while let Some(join_result) = tasks.next().await {
+            match join_result {
+                Ok(Ok(_)) => {}
+                Ok(Err(e)) => Err(e)?,
+                Err(join_err) => Err(join_err)?,
+            }
+        }
+
+        let repodata_shards_path = format!("{subdir}/{REPODATA_SHARDS}");
+        tracing::trace!("Writing repodata shards to {repodata_shards_path}");
+        let sharded_repodata_encoded = serialize_msgpack_zst(&sharded_repodata)?;
+        op.write(&repodata_shards_path, sharded_repodata_encoded)
+            .await?;
+    }
     Ok(())
 }
 
+/// Configuration for `index_fs`
+pub struct IndexFsConfig {
+    /// The channel to index.
+    pub channel: PathBuf,
+    /// The target platform to index.
+    pub target_platform: Option<Platform>,
+    /// The path to a repodata patch to apply to the index.
+    pub repodata_patch: Option<String>,
+    /// Whether to write the repodata as a zstd-compressed file.
+    pub write_zst: bool,
+    /// Whether to write the repodata shards.
+    pub write_shards: bool,
+    /// Whether to force the index to be written.
+    pub force: bool,
+    /// The maximum number of parallel tasks to run.
+    pub max_parallel: usize,
+    /// The multi-progress bar to use for the index.
+    pub multi_progress: Option<MultiProgress>,
+}
+
 /// Create a new `repodata.json` for all packages in the channel at the given directory.
-#[allow(clippy::too_many_arguments)]
 pub async fn index_fs(
-    channel: impl Into<PathBuf>,
-    target_platform: Option<Platform>,
-    repodata_patch: Option<String>,
-    force: bool,
-    max_parallel: usize,
-    multi_progress: Option<MultiProgress>,
+    IndexFsConfig {
+        channel,
+        target_platform,
+        repodata_patch,
+        write_zst,
+        write_shards,
+        force,
+        max_parallel,
+        multi_progress,
+    }: IndexFsConfig,
 ) -> anyhow::Result<()> {
     let mut config = FsConfig::default();
-    config.root = Some(channel.into().canonicalize()?.to_string_lossy().to_string());
+    config.root = Some(channel.canonicalize()?.to_string_lossy().to_string());
     index(
         target_platform,
         config,
         repodata_patch,
+        write_zst,
+        write_shards,
         force,
         max_parallel,
         multi_progress,
@@ -421,21 +595,56 @@ pub async fn index_fs(
     .await
 }
 
+/// Configuration for `index_s3`
+pub struct IndexS3Config {
+    /// The channel to index.
+    pub channel: Url,
+    /// The region of the S3 bucket.
+    pub region: String,
+    /// The endpoint URL of the S3 bucket.
+    pub endpoint_url: Url,
+    /// Whether to force path style for the S3 bucket.
+    pub force_path_style: bool,
+    /// The access key ID for the S3 bucket.
+    pub access_key_id: Option<String>,
+    /// The secret access key for the S3 bucket.
+    pub secret_access_key: Option<String>,
+    /// The session token for the S3 bucket.
+    pub session_token: Option<String>,
+    /// The target platform to index.
+    pub target_platform: Option<Platform>,
+    /// The path to a repodata patch to apply to the index.
+    pub repodata_patch: Option<String>,
+    /// Whether to write the repodata as a zstd-compressed file.
+    pub write_zst: bool,
+    /// Whether to write the repodata shards.
+    pub write_shards: bool,
+    /// Whether to force the index to be written.
+    pub force: bool,
+    /// The maximum number of parallel tasks to run.
+    pub max_parallel: usize,
+    /// The multi-progress bar to use for the index.
+    pub multi_progress: Option<MultiProgress>,
+}
+
 /// Create a new `repodata.json` for all packages in the channel at the given S3 URL.
-#[allow(clippy::too_many_arguments)]
 pub async fn index_s3(
-    channel: Url,
-    region: String,
-    endpoint_url: Url,
-    force_path_style: bool,
-    access_key_id: Option<String>,
-    secret_access_key: Option<String>,
-    session_token: Option<String>,
-    target_platform: Option<Platform>,
-    repodata_patch: Option<String>,
-    force: bool,
-    max_parallel: usize,
-    multi_progress: Option<MultiProgress>,
+    IndexS3Config {
+        channel,
+        region,
+        endpoint_url,
+        force_path_style,
+        access_key_id,
+        secret_access_key,
+        session_token,
+        target_platform,
+        repodata_patch,
+        write_zst,
+        write_shards,
+        force,
+        max_parallel,
+        multi_progress,
+    }: IndexS3Config,
 ) -> anyhow::Result<()> {
     let mut s3_config = S3Config::default();
     s3_config.root = Some(channel.path().to_string());
@@ -473,6 +682,8 @@ pub async fn index_s3(
         target_platform,
         s3_config,
         repodata_patch,
+        write_zst,
+        write_shards,
         force,
         max_parallel,
         multi_progress,
@@ -492,10 +703,13 @@ pub async fn index_s3(
 ///    2. Collect all registered packages from `repodata.json` (if exists)
 ///    3. Determine which packages to add to and to delete from `repodata.json`
 ///    4. Write `repodata.json` back
+#[allow(clippy::too_many_arguments)]
 pub async fn index<T: Configurator>(
     target_platform: Option<Platform>,
     config: T,
     repodata_patch: Option<String>,
+    write_zst: bool,
+    write_shards: bool,
     force: bool,
     max_parallel: usize,
     multi_progress: Option<MultiProgress>,
@@ -569,6 +783,8 @@ pub async fn index<T: Configurator>(
             *subdir,
             op.clone(),
             force,
+            write_zst,
+            write_shards,
             repodata_patch
                 .as_ref()
                 .and_then(|p| p.subdirs.get(&subdir.to_string()).cloned()),