enable proxies for uv

Author: gzm55

src/install_pypi/mod.rs

@@ -78,16 +78,18 @@ pub async fn update_python_distributions(
         .into_diagnostic()?;
     let build_options = no_build_to_build_options(no_build).into_diagnostic()?;
 
-    // TODO: enable proxy for uv registry_client
-    let registry_client = Arc::new(
-        RegistryClientBuilder::new(uv_context.cache.clone())
-            .allow_insecure_host(uv_context.allow_insecure_host.clone())
-            .index_urls(index_locations.index_urls())
-            .keyring(uv_context.keyring_provider)
-            .connectivity(Connectivity::Online)
-            .extra_middleware(uv_context.extra_middleware.clone())
-            .build(),
-    );
+    let mut uv_client_builder = RegistryClientBuilder::new(uv_context.cache.clone())
+        .allow_insecure_host(uv_context.allow_insecure_host.clone())
+        .index_urls(index_locations.index_urls())
+        .keyring(uv_context.keyring_provider)
+        .connectivity(Connectivity::Online)
+        .extra_middleware(uv_context.extra_middleware.clone());
+
+    for p in &uv_context.proxies {
+        uv_client_builder = uv_client_builder.proxy(p.clone())
+    }
+
+    let registry_client = Arc::new(uv_client_builder.build());
 
     // Resolve the flat indexes from `--find-links`.
     let flat_index = {

src/lock_file/resolve/pypi.rs

@@ -282,19 +282,22 @@ pub async fn resolve_pypi(
         pypi_options_to_index_locations(pypi_options, project_root).into_diagnostic()?;
 
     // TODO: create a cached registry client per index_url set?
-    // TODO: enable proxy for uv registry_client
     let index_strategy = to_index_strategy(pypi_options.index_strategy.as_ref());
-    let registry_client = Arc::new(
-        RegistryClientBuilder::new(context.cache.clone())
-            .allow_insecure_host(context.allow_insecure_host.clone())
-            .index_urls(index_locations.index_urls())
-            .index_strategy(index_strategy)
-            .markers(&marker_environment)
-            .keyring(context.keyring_provider)
-            .connectivity(Connectivity::Online)
-            .extra_middleware(context.extra_middleware.clone())
-            .build(),
-    );
+    let mut uv_client_builder = RegistryClientBuilder::new(context.cache.clone())
+        .allow_insecure_host(context.allow_insecure_host.clone())
+        .index_urls(index_locations.index_urls())
+        .index_strategy(index_strategy)
+        .markers(&marker_environment)
+        .keyring(context.keyring_provider)
+        .connectivity(Connectivity::Online)
+        .extra_middleware(context.extra_middleware.clone());
+
+    for p in &context.proxies {
+        uv_client_builder = uv_client_builder.proxy(p.clone())
+    }
+
+    let registry_client = Arc::new(uv_client_builder.build());
+
     let build_options =
         no_build_to_build_options(&pypi_options.no_build.clone().unwrap_or_default())
             .into_diagnostic()?;

src/lock_file/resolve/uv_resolution_context.rs

@@ -25,6 +25,7 @@ pub struct UvResolutionContext {
     pub allow_insecure_host: Vec<TrustedHost>,
     pub shared_state: SharedState,
     pub extra_middleware: ExtraMiddleware,
+    pub proxies: Vec<reqwest::Proxy>,
 }
 
 impl UvResolutionContext {
@@ -75,6 +76,7 @@ impl UvResolutionContext {
             allow_insecure_host,
             shared_state: SharedState::default(),
             extra_middleware: ExtraMiddleware(uv_middlewares(project.config())),
+            proxies: project.config().get_proxies().into_diagnostic()?,
         })
     }