Move concurrency settings to top-level (#4257)

These are global and non-specific to the `pip` API, so I think they should be elevated. - Ran `UV_CONCURRENT_DOWNLOADS=1 cargo run pip list`; verified that `downloads` resolved to 1. - Added `concurrent-downloads = 5` under `[tool.uv]` in `pyproject.toml`; ran `cargo run pip list`; verified that `downloads` resolved to 5. - Ran `UV_CONCURRENT_DOWNLOADS=1 cargo run pip list`; verified that `downloads` resolved to 1.
astral-sh · Aug 20, 2024 · 01fb41f · 01fb41f
1 parent e11bbb5
commit 01fb41f
Show file tree

Hide file tree

Showing 7 changed files with 290 additions and 311 deletions.
diff --git a/crates/uv-settings/src/settings.rs b/crates/uv-settings/src/settings.rs
@@ -168,6 +168,39 @@ pub struct GlobalOptions {
         possible_values = true
     )]
     pub python_downloads: Option<PythonDownloads>,
+    /// The maximum number of in-flight concurrent downloads that uv will perform at any given
+    /// time.
+    #[option(
+        default = "50",
+        value_type = "int",
+        example = r#"
+            concurrent-downloads = 4
+        "#
+    )]
+    pub concurrent_downloads: Option<NonZeroUsize>,
+    /// The maximum number of source distributions that uv will build concurrently at any given
+    /// time.
+    ///
+    /// Defaults to the number of available CPU cores.
+    #[option(
+        default = "None",
+        value_type = "int",
+        example = r#"
+            concurrent-builds = 4
+        "#
+    )]
+    pub concurrent_builds: Option<NonZeroUsize>,
+    /// The number of threads used when installing and unzipping packages.
+    ///
+    /// Defaults to the number of available CPU cores.
+    #[option(
+        default = "None",
+        value_type = "int",
+        example = r#"
+            concurrent-installs = 4
+        "#
+    )]
+    pub concurrent_installs: Option<NonZeroUsize>,
 }
 
 /// Settings relevant to all installer operations.
@@ -1176,39 +1209,6 @@ pub struct PipOptions {
         "#
     )]
     pub reinstall_package: Option<Vec<PackageName>>,
-    /// The maximum number of in-flight concurrent downloads that uv will perform at any given
-    /// time.
-    #[option(
-        default = "50",
-        value_type = "int",
-        example = r#"
-            concurrent-downloads = 4
-        "#
-    )]
-    pub concurrent_downloads: Option<NonZeroUsize>,
-    /// The maximum number of source distributions that uv will build concurrently at any given
-    /// time.
-    ///
-    /// Defaults to the number of available CPU cores.
-    #[option(
-        default = "None",
-        value_type = "int",
-        example = r#"
-            concurrent-builds = 4
-        "#
-    )]
-    pub concurrent_builds: Option<NonZeroUsize>,
-    /// The number of threads used when installing and unzipping packages.
-    ///
-    /// Defaults to the number of available CPU cores.
-    #[option(
-        default = "None",
-        value_type = "int",
-        example = r#"
-            concurrent-installs = 4
-        "#
-    )]
-    pub concurrent_installs: Option<NonZeroUsize>,
 }
 
 impl From<ResolverInstallerOptions> for ResolverOptions {

diff --git a/crates/uv/src/commands/venv.rs b/crates/uv/src/commands/venv.rs
@@ -55,6 +55,7 @@ pub(crate) async fn venv(
     seed: bool,
     allow_existing: bool,
     exclude_newer: Option<ExcludeNewer>,
+    concurrency: Concurrency,
     native_tls: bool,
     cache: &Cache,
     printer: Printer,
@@ -75,6 +76,7 @@ pub(crate) async fn venv(
         python_downloads,
         allow_existing,
         exclude_newer,
+        concurrency,
         native_tls,
         cache,
         printer,
@@ -126,6 +128,7 @@ async fn venv_impl(
     python_downloads: PythonDownloads,
     allow_existing: bool,
     exclude_newer: Option<ExcludeNewer>,
+    concurrency: Concurrency,
     native_tls: bool,
     cache: &Cache,
     printer: Printer,
@@ -268,9 +271,8 @@ async fn venv_impl(
         // Initialize any shared state.
         let state = SharedState::default();
 
-        // For seed packages, assume a bunch of default settings and concurrency are sufficient.
+        // For seed packages, assume a bunch of default settings are sufficient.
         let build_constraints = [];
-        let concurrency = Concurrency::default();
         let config_settings = ConfigSettings::default();
         let setup_py = SetupPyStrategy::default();
         let sources = SourceStrategy::Disabled;

diff --git a/crates/uv/src/lib.rs b/crates/uv/src/lib.rs
@@ -20,7 +20,6 @@ use uv_cli::{
 use uv_cli::{PythonCommand, PythonNamespace, ToolCommand, ToolNamespace};
 #[cfg(feature = "self-update")]
 use uv_cli::{SelfCommand, SelfNamespace};
-use uv_configuration::Concurrency;
 use uv_fs::CWD;
 use uv_requirements::RequirementsSource;
 use uv_scripts::Pep723Script;
@@ -209,6 +208,11 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
         )
     }))?;
 
+    rayon::ThreadPoolBuilder::new()
+        .num_threads(globals.concurrency.installs)
+        .build_global()
+        .expect("failed to initialize global rayon pool");
+
     debug!("uv {}", version::version());
 
     // Write out any resolved settings.
@@ -246,11 +250,6 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
             let args = PipCompileSettings::resolve(args, filesystem);
             show_settings!(args);
 
-            rayon::ThreadPoolBuilder::new()
-                .num_threads(args.settings.concurrency.installs)
-                .build_global()
-                .expect("failed to initialize global rayon pool");
-
             // Initialize the cache.
             let cache = cache.init()?.with_refresh(
                 args.refresh
@@ -323,7 +322,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
                 args.settings.python,
                 args.settings.system,
                 globals.python_preference,
-                args.settings.concurrency,
+                globals.concurrency,
                 globals.native_tls,
                 globals.quiet,
                 cache,
@@ -340,11 +339,6 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
             let args = PipSyncSettings::resolve(args, filesystem);
             show_settings!(args);
 
-            rayon::ThreadPoolBuilder::new()
-                .num_threads(args.settings.concurrency.installs)
-                .build_global()
-                .expect("failed to initialize global rayon pool");
-
             // Initialize the cache.
             let cache = cache.init()?.with_refresh(
                 args.refresh
@@ -396,7 +390,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
                 args.settings.target,
                 args.settings.prefix,
                 args.settings.sources,
-                args.settings.concurrency,
+                globals.concurrency,
                 globals.native_tls,
                 cache,
                 args.dry_run,
@@ -413,11 +407,6 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
             let args = PipInstallSettings::resolve(args, filesystem);
             show_settings!(args);
 
-            rayon::ThreadPoolBuilder::new()
-                .num_threads(args.settings.concurrency.installs)
-                .build_global()
-                .expect("failed to initialize global rayon pool");
-
             // Initialize the cache.
             let cache = cache.init()?.with_refresh(
                 args.refresh
@@ -488,7 +477,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
                 args.settings.break_system_packages,
                 args.settings.target,
                 args.settings.prefix,
-                args.settings.concurrency,
+                globals.concurrency,
                 globals.native_tls,
                 cache,
                 args.dry_run,
@@ -693,6 +682,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
                 args.seed,
                 args.allow_existing,
                 args.settings.exclude_newer,
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
@@ -762,7 +752,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
                 globals.python_preference,
                 globals.python_downloads,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 cache,
                 printer,
@@ -806,7 +796,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
                 globals.python_preference,
                 globals.python_downloads,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
@@ -840,7 +830,7 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
                 globals.connectivity,
                 args.args,
                 args.filesystem,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
@@ -1048,7 +1038,7 @@ async fn run_project(
                 globals.python_preference,
                 globals.python_downloads,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
@@ -1079,7 +1069,7 @@ async fn run_project(
                 globals.python_downloads,
                 args.settings,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
@@ -1102,7 +1092,7 @@ async fn run_project(
                 globals.python_preference,
                 globals.python_downloads,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
@@ -1142,7 +1132,7 @@ async fn run_project(
                 )
                 .collect::<Vec<_>>();
 
-            commands::add(
+            Box::pin(commands::add(
                 args.locked,
                 args.frozen,
                 args.no_sync,
@@ -1161,11 +1151,11 @@ async fn run_project(
                 globals.python_preference,
                 globals.python_downloads,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
-            )
+            ))
             .await
         }
         ProjectCommand::Remove(args) => {
@@ -1193,7 +1183,7 @@ async fn run_project(
                 globals.python_preference,
                 globals.python_downloads,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,
@@ -1224,7 +1214,7 @@ async fn run_project(
                 globals.python_preference,
                 globals.python_downloads,
                 globals.connectivity,
-                Concurrency::default(),
+                globals.concurrency,
                 globals.native_tls,
                 &cache,
                 printer,