Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't destructure global networks 

From reviewing #14687, I was reminded that every base client operation requires manually destructuring the `NetworkSettings`. We can avoid that by passing the global network settings directly.
This commit is contained in:
konstin 2025-08-06 12:57:59 +02:00
parent 91653f5fee
commit 7e44d581cd
33 changed files with 167 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/uv-client/src/base_client.rs
View File

@ -48,6 +48,14 @@ pub const DEFAULT_RETRIES: u32 = 3;
/// This is the default used by [`reqwest`]. /// This is the default used by [`reqwest`].
const DEFAULT_MAX_REDIRECTS: u32 = 10; const DEFAULT_MAX_REDIRECTS: u32 = 10;
/// Global network settings for HTTP client configuration.
#[derive(Debug, Clone, Default)]
pub struct NetworkSettings {
pub connectivity: Connectivity,
pub native_tls: bool,
pub allow_insecure_host: Vec<TrustedHost>,
}
/// Selectively skip parts or the entire auth middleware. /// Selectively skip parts or the entire auth middleware.
#[derive(Debug, Clone, Copy, Default)] #[derive(Debug, Clone, Copy, Default)]
pub enum AuthIntegration { pub enum AuthIntegration {
@ -152,14 +160,11 @@ impl<'a> BaseClientBuilder<'a> {
} }
#[must_use] #[must_use]
pub fn allow_insecure_host(mut self, allow_insecure_host: Vec<TrustedHost>) -> Self { pub fn network_settings(mut self, settings: &NetworkSettings) -> Self {
self.allow_insecure_host = allow_insecure_host; self.connectivity = settings.connectivity;
self self.native_tls = settings.native_tls;
} self.allow_insecure_host
.clone_from(&settings.allow_insecure_host);
#[must_use]
pub fn connectivity(mut self, connectivity: Connectivity) -> Self {
self.connectivity = connectivity;
self self
} }
@ -188,12 +193,6 @@ impl<'a> BaseClientBuilder<'a> {
} }
} }
#[must_use]
pub fn native_tls(mut self, native_tls: bool) -> Self {
self.native_tls = native_tls;
self
}
#[must_use] #[must_use]
pub fn built_in_root_certs(mut self, built_in_root_certs: bool) -> Self { pub fn built_in_root_certs(mut self, built_in_root_certs: bool) -> Self {
self.built_in_root_certs = built_in_root_certs; self.built_in_root_certs = built_in_root_certs;

3
crates/uv-client/src/lib.rs
View File

@ -1,6 +1,7 @@
pub use base_client::{ pub use base_client::{
AuthIntegration, BaseClient, BaseClientBuilder, DEFAULT_RETRIES, ExtraMiddleware, AuthIntegration, BaseClient, BaseClientBuilder, DEFAULT_RETRIES, ExtraMiddleware,
RedirectClientWithMiddleware, RequestBuilder, UvRetryableStrategy, is_extended_transient_error, NetworkSettings, RedirectClientWithMiddleware, RedirectPolicy, RequestBuilder,
UvRetryableStrategy, is_extended_transient_error,
}; };
pub use cached_client::{CacheControl, CachedClient, CachedClientError, DataWithCachePolicy}; pub use cached_client::{CacheControl, CachedClient, CachedClientError, DataWithCachePolicy};
pub use error::{Error, ErrorKind, WrappedReqwestError}; pub use error::{Error, ErrorKind, WrappedReqwestError};

26
crates/uv-client/src/registry_client.rs
View File

@ -17,8 +17,8 @@ use url::Url;
use uv_auth::Indexes; use uv_auth::Indexes;
use uv_cache::{Cache, CacheBucket, CacheEntry, WheelCache}; use uv_cache::{Cache, CacheBucket, CacheEntry, WheelCache};
use uv_configuration::IndexStrategy;
use uv_configuration::KeyringProviderType; use uv_configuration::KeyringProviderType;
use uv_configuration::{IndexStrategy, TrustedHost};
use uv_distribution_filename::{DistFilename, SourceDistFilename, WheelFilename}; use uv_distribution_filename::{DistFilename, SourceDistFilename, WheelFilename};
use uv_distribution_types::{ use uv_distribution_types::{
BuiltDist, File, IndexCapabilities, IndexFormat, IndexLocations, IndexMetadataRef, BuiltDist, File, IndexCapabilities, IndexFormat, IndexLocations, IndexMetadataRef,
@ -34,15 +34,15 @@ use uv_redacted::DisplaySafeUrl;
use uv_small_str::SmallString; use uv_small_str::SmallString;
use uv_torch::TorchStrategy; use uv_torch::TorchStrategy;
use crate::base_client::{BaseClientBuilder, ExtraMiddleware, RedirectPolicy};
use crate::cached_client::CacheControl; use crate::cached_client::CacheControl;
use crate::flat_index::FlatIndexEntry; use crate::flat_index::FlatIndexEntry;
use crate::html::SimpleHtml; use crate::html::SimpleHtml;
use crate::remote_metadata::wheel_metadata_from_remote_zip; use crate::remote_metadata::wheel_metadata_from_remote_zip;
use crate::rkyvutil::OwnedArchive; use crate::rkyvutil::OwnedArchive;
use crate::{ use crate::{
BaseClient, CachedClient, Error, ErrorKind, FlatIndexClient, FlatIndexEntries, BaseClient, BaseClientBuilder, CachedClient, Error, ErrorKind, ExtraMiddleware,
RedirectClientWithMiddleware, FlatIndexClient, FlatIndexEntries, NetworkSettings, RedirectClientWithMiddleware,
RedirectPolicy,
}; };
/// A builder for an [`RegistryClient`]. /// A builder for an [`RegistryClient`].
@ -95,20 +95,6 @@ impl<'a> RegistryClientBuilder<'a> {
self self
} }
#[must_use]
pub fn allow_insecure_host(mut self, allow_insecure_host: Vec<TrustedHost>) -> Self {
self.base_client_builder = self
.base_client_builder
.allow_insecure_host(allow_insecure_host);
self
}
#[must_use]
pub fn connectivity(mut self, connectivity: Connectivity) -> Self {
self.base_client_builder = self.base_client_builder.connectivity(connectivity);
self
}
#[must_use] #[must_use]
pub fn retries(mut self, retries: u32) -> Self { pub fn retries(mut self, retries: u32) -> Self {
self.base_client_builder = self.base_client_builder.retries(retries); self.base_client_builder = self.base_client_builder.retries(retries);
@ -121,8 +107,8 @@ impl<'a> RegistryClientBuilder<'a> {
} }
#[must_use] #[must_use]
pub fn native_tls(mut self, native_tls: bool) -> Self { pub fn network_settings(mut self, settings: &NetworkSettings) -> Self {
self.base_client_builder = self.base_client_builder.native_tls(native_tls); self.base_client_builder = self.base_client_builder.network_settings(settings);
self self
} }

11
crates/uv-requirements/src/upgrade.rs
View File

@ -2,7 +2,7 @@ use std::path::Path;
use anyhow::Result; use anyhow::Result;
use uv_client::{BaseClientBuilder, Connectivity}; use uv_client::{BaseClientBuilder, Connectivity, NetworkSettings};
use uv_configuration::Upgrade; use uv_configuration::Upgrade;
use uv_fs::CWD; use uv_fs::CWD;
use uv_git::ResolvedRepositoryReference; use uv_git::ResolvedRepositoryReference;
@ -37,11 +37,18 @@ pub async fn read_requirements_txt(
return Ok(Vec::new()); return Ok(Vec::new());
} }
// TODO(konsti): Use a better abstraction.
let network_settings = NetworkSettings {
connectivity: Connectivity::Offline,
native_tls: false,
allow_insecure_host: Vec::new(),
};
// Parse the requirements from the lockfile. // Parse the requirements from the lockfile.
let requirements_txt = RequirementsTxt::parse( let requirements_txt = RequirementsTxt::parse(
output_file, output_file,
&*CWD, &*CWD,
&BaseClientBuilder::new().connectivity(Connectivity::Offline), &BaseClientBuilder::new().network_settings(&network_settings),
) )
.await?; .await?;

8
crates/uv/src/commands/build_frontend.rs
View File

@ -12,7 +12,7 @@ use tracing::instrument;
use uv_build_backend::check_direct_build; use uv_build_backend::check_direct_build;
use uv_cache::{Cache, CacheBucket}; use uv_cache::{Cache, CacheBucket};
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
BuildKind, BuildOptions, BuildOutput, Concurrency, ConfigSettings, Constraints, BuildKind, BuildOptions, BuildOutput, Concurrency, ConfigSettings, Constraints,
DependencyGroupsWithDefaults, HashCheckingMode, IndexStrategy, KeyringProviderType, DependencyGroupsWithDefaults, HashCheckingMode, IndexStrategy, KeyringProviderType,
@ -47,7 +47,7 @@ use crate::commands::pip::operations;
use crate::commands::project::{ProjectError, find_requires_python}; use crate::commands::project::{ProjectError, find_requires_python};
use crate::commands::reporters::PythonDownloadReporter; use crate::commands::reporters::PythonDownloadReporter;
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverSettings}; use crate::settings::ResolverSettings;
#[derive(Debug, Error)] #[derive(Debug, Error)]
enum Error { enum Error {
@ -212,9 +212,7 @@ async fn build_impl(
let client_builder = BaseClientBuilder::default() let client_builder = BaseClientBuilder::default()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Determine the source to build. // Determine the source to build.
let src = if let Some(src) = src { let src = if let Some(src) = src {

9
crates/uv/src/commands/pip/compile.rs
View File

@ -11,7 +11,7 @@ use rustc_hash::FxHashSet;
use tracing::debug; use tracing::debug;
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
BuildOptions, Concurrency, ConfigSettings, Constraints, ExportFormat, ExtrasSpecification, BuildOptions, Concurrency, ConfigSettings, Constraints, ExportFormat, ExtrasSpecification,
IndexStrategy, NoBinary, NoBuild, PackageConfigSettings, Preview, PreviewFeatures, Reinstall, IndexStrategy, NoBinary, NoBuild, PackageConfigSettings, Preview, PreviewFeatures, Reinstall,
@ -53,7 +53,6 @@ use crate::commands::pip::loggers::DefaultResolveLogger;
use crate::commands::pip::{operations, resolution_environment}; use crate::commands::pip::{operations, resolution_environment};
use crate::commands::{ExitStatus, OutputWriter, diagnostics}; use crate::commands::{ExitStatus, OutputWriter, diagnostics};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Resolve a set of requirements into a set of pinned versions. /// Resolve a set of requirements into a set of pinned versions.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -195,10 +194,8 @@ pub(crate) async fn pip_compile(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Read all requirements from the provided sources. // Read all requirements from the provided sources.
let RequirementsSpecification { let RequirementsSpecification {

9
crates/uv/src/commands/pip/install.rs
View File

@ -7,7 +7,7 @@ use owo_colors::OwoColorize;
use tracing::{Level, debug, enabled, warn}; use tracing::{Level, debug, enabled, warn};
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
BuildOptions, Concurrency, ConfigSettings, Constraints, DryRun, ExtrasSpecification, BuildOptions, Concurrency, ConfigSettings, Constraints, DryRun, ExtrasSpecification,
HashCheckingMode, IndexStrategy, PackageConfigSettings, Preview, PreviewFeatures, Reinstall, HashCheckingMode, IndexStrategy, PackageConfigSettings, Preview, PreviewFeatures, Reinstall,
@ -47,7 +47,6 @@ use crate::commands::pip::operations::{report_interpreter, report_target_environ
use crate::commands::pip::{operations, resolution_markers, resolution_tags}; use crate::commands::pip::{operations, resolution_markers, resolution_tags};
use crate::commands::{ExitStatus, diagnostics}; use crate::commands::{ExitStatus, diagnostics};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Install packages into the current environment. /// Install packages into the current environment.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -113,10 +112,8 @@ pub(crate) async fn pip_install(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Read all requirements from the provided sources. // Read all requirements from the provided sources.
let RequirementsSpecification { let RequirementsSpecification {

9
crates/uv/src/commands/pip/list.rs
View File

@ -14,7 +14,7 @@ use unicode_width::UnicodeWidthStr;
use uv_cache::{Cache, Refresh}; use uv_cache::{Cache, Refresh};
use uv_cache_info::Timestamp; use uv_cache_info::Timestamp;
use uv_cli::ListFormat; use uv_cli::ListFormat;
use uv_client::{BaseClientBuilder, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{Concurrency, IndexStrategy, KeyringProviderType, Preview}; use uv_configuration::{Concurrency, IndexStrategy, KeyringProviderType, Preview};
use uv_distribution_filename::DistFilename; use uv_distribution_filename::DistFilename;
use uv_distribution_types::{ use uv_distribution_types::{
@ -33,7 +33,6 @@ use crate::commands::pip::latest::LatestClient;
use crate::commands::pip::operations::report_target_environment; use crate::commands::pip::operations::report_target_environment;
use crate::commands::reporters::LatestVersionReporter; use crate::commands::reporters::LatestVersionReporter;
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Enumerate the installed packages in the current environment. /// Enumerate the installed packages in the current environment.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -89,10 +88,8 @@ pub(crate) async fn pip_list(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Initialize the registry client. // Initialize the registry client.
let client = RegistryClientBuilder::try_from(client_builder)? let client = RegistryClientBuilder::try_from(client_builder)?

9
crates/uv/src/commands/pip/sync.rs
View File

@ -6,7 +6,7 @@ use owo_colors::OwoColorize;
use tracing::{debug, warn}; use tracing::{debug, warn};
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
BuildOptions, Concurrency, ConfigSettings, Constraints, DryRun, ExtrasSpecification, BuildOptions, Concurrency, ConfigSettings, Constraints, DryRun, ExtrasSpecification,
HashCheckingMode, IndexStrategy, PackageConfigSettings, Preview, PreviewFeatures, Reinstall, HashCheckingMode, IndexStrategy, PackageConfigSettings, Preview, PreviewFeatures, Reinstall,
@ -43,7 +43,6 @@ use crate::commands::pip::operations::{report_interpreter, report_target_environ
use crate::commands::pip::{operations, resolution_markers, resolution_tags}; use crate::commands::pip::{operations, resolution_markers, resolution_tags};
use crate::commands::{ExitStatus, diagnostics}; use crate::commands::{ExitStatus, diagnostics};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Install a set of locked requirements into the current Python environment. /// Install a set of locked requirements into the current Python environment.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -99,10 +98,8 @@ pub(crate) async fn pip_sync(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Initialize a few defaults. // Initialize a few defaults.
let overrides = &[]; let overrides = &[];

9
crates/uv/src/commands/pip/tree.rs
View File

@ -12,7 +12,7 @@ use tokio::sync::Semaphore;
use uv_cache::{Cache, Refresh}; use uv_cache::{Cache, Refresh};
use uv_cache_info::Timestamp; use uv_cache_info::Timestamp;
use uv_client::{BaseClientBuilder, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{Concurrency, IndexStrategy, KeyringProviderType, Preview}; use uv_configuration::{Concurrency, IndexStrategy, KeyringProviderType, Preview};
use uv_distribution_types::{Diagnostic, IndexCapabilities, IndexLocations, Name, RequiresPython}; use uv_distribution_types::{Diagnostic, IndexCapabilities, IndexLocations, Name, RequiresPython};
use uv_installer::SitePackages; use uv_installer::SitePackages;
@ -28,7 +28,6 @@ use crate::commands::pip::latest::LatestClient;
use crate::commands::pip::operations::report_target_environment; use crate::commands::pip::operations::report_target_environment;
use crate::commands::reporters::LatestVersionReporter; use crate::commands::reporters::LatestVersionReporter;
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Display the installed packages in the current environment as a dependency tree. /// Display the installed packages in the current environment as a dependency tree.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -88,10 +87,8 @@ pub(crate) async fn pip_tree(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Initialize the registry client. // Initialize the registry client.
let client = RegistryClientBuilder::try_from(client_builder)? let client = RegistryClientBuilder::try_from(client_builder)?

9
crates/uv/src/commands/pip/uninstall.rs
View File

@ -6,7 +6,7 @@ use owo_colors::OwoColorize;
use tracing::{debug, warn}; use tracing::{debug, warn};
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::BaseClientBuilder; use uv_client::{BaseClientBuilder, NetworkSettings};
use uv_configuration::{DryRun, KeyringProviderType, Preview}; use uv_configuration::{DryRun, KeyringProviderType, Preview};
use uv_distribution_types::Requirement; use uv_distribution_types::Requirement;
use uv_distribution_types::{InstalledMetadata, Name, UnresolvedRequirement}; use uv_distribution_types::{InstalledMetadata, Name, UnresolvedRequirement};
@ -21,7 +21,6 @@ use uv_requirements::{RequirementsSource, RequirementsSpecification};
use crate::commands::pip::operations::report_target_environment; use crate::commands::pip::operations::report_target_environment;
use crate::commands::{ExitStatus, elapsed}; use crate::commands::{ExitStatus, elapsed};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Uninstall packages from the current environment. /// Uninstall packages from the current environment.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -43,10 +42,8 @@ pub(crate) async fn pip_uninstall(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Read all requirements from the provided sources. // Read all requirements from the provided sources.
let spec = RequirementsSpecification::from_simple_sources(sources, &client_builder).await?; let spec = RequirementsSpecification::from_simple_sources(sources, &client_builder).await?;

14
crates/uv/src/commands/project/add.rs
View File

@ -15,7 +15,7 @@ use url::Url;
use uv_cache::Cache; use uv_cache::Cache;
use uv_cache_key::RepositoryUrl; use uv_cache_key::RepositoryUrl;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
Concurrency, Constraints, DependencyGroups, DependencyGroupsWithDefaults, DevMode, DryRun, Concurrency, Constraints, DependencyGroups, DependencyGroupsWithDefaults, DevMode, DryRun,
EditableMode, ExtrasSpecification, ExtrasSpecificationWithDefaults, InstallOptions, Preview, EditableMode, ExtrasSpecification, ExtrasSpecificationWithDefaults, InstallOptions, Preview,
@ -59,7 +59,7 @@ use crate::commands::project::{
use crate::commands::reporters::{PythonDownloadReporter, ResolverReporter}; use crate::commands::reporters::{PythonDownloadReporter, ResolverReporter};
use crate::commands::{ExitStatus, ScriptPath, diagnostics, project}; use crate::commands::{ExitStatus, ScriptPath, diagnostics, project};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverInstallerSettings}; use crate::settings::ResolverInstallerSettings;
/// Add one or more packages to the project requirements. /// Add one or more packages to the project requirements.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -189,9 +189,7 @@ pub(crate) async fn add(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// If we found a script, add to the existing metadata. Otherwise, create a new inline // If we found a script, add to the existing metadata. Otherwise, create a new inline
// metadata tag. // metadata tag.
@ -343,10 +341,8 @@ pub(crate) async fn add(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings)
.native_tls(network_settings.native_tls) .keyring(settings.resolver.keyring_provider);
.keyring(settings.resolver.keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Read the requirements. // Read the requirements.
let RequirementsSpecification { let RequirementsSpecification {

3
crates/uv/src/commands/project/environment.rs
View File

@ -8,10 +8,11 @@ use crate::commands::project::{
EnvironmentSpecification, PlatformState, ProjectError, resolve_environment, sync_environment, EnvironmentSpecification, PlatformState, ProjectError, resolve_environment, sync_environment,
}; };
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverInstallerSettings}; use crate::settings::ResolverInstallerSettings;
use uv_cache::{Cache, CacheBucket}; use uv_cache::{Cache, CacheBucket};
use uv_cache_key::{cache_digest, hash_digest}; use uv_cache_key::{cache_digest, hash_digest};
use uv_client::NetworkSettings;
use uv_configuration::{Concurrency, Constraints, Preview}; use uv_configuration::{Concurrency, Constraints, Preview};
use uv_distribution_types::{Name, Resolution}; use uv_distribution_types::{Name, Resolution};
use uv_fs::PythonExt; use uv_fs::PythonExt;

3
crates/uv/src/commands/project/export.rs
View File

@ -7,6 +7,7 @@ use itertools::Itertools;
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::NetworkSettings;
use uv_configuration::{ use uv_configuration::{
Concurrency, DependencyGroups, EditableMode, ExportFormat, ExtrasSpecification, InstallOptions, Concurrency, DependencyGroups, EditableMode, ExportFormat, ExtrasSpecification, InstallOptions,
Preview, Preview,
@ -29,7 +30,7 @@ use crate::commands::project::{
}; };
use crate::commands::{ExitStatus, OutputWriter, diagnostics}; use crate::commands::{ExitStatus, OutputWriter, diagnostics};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverSettings}; use crate::settings::ResolverSettings;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(clippy::large_enum_variant)] #[allow(clippy::large_enum_variant)]

11
crates/uv/src/commands/project/init.rs
View File

@ -10,7 +10,7 @@ use uv_distribution_types::RequiresPython;
use tracing::{debug, trace, warn}; use tracing::{debug, trace, warn};
use uv_cache::Cache; use uv_cache::Cache;
use uv_cli::AuthorFrom; use uv_cli::AuthorFrom;
use uv_client::BaseClientBuilder; use uv_client::{BaseClientBuilder, NetworkSettings};
use uv_configuration::{ use uv_configuration::{
DependencyGroupsWithDefaults, Preview, ProjectBuildBackend, VersionControlError, DependencyGroupsWithDefaults, Preview, ProjectBuildBackend, VersionControlError,
VersionControlSystem, VersionControlSystem,
@ -35,7 +35,6 @@ use crate::commands::ExitStatus;
use crate::commands::project::{find_requires_python, init_script_python_requirement}; use crate::commands::project::{find_requires_python, init_script_python_requirement};
use crate::commands::reporters::PythonDownloadReporter; use crate::commands::reporters::PythonDownloadReporter;
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Add one or more packages to the project requirements. /// Add one or more packages to the project requirements.
#[allow(clippy::single_match_else, clippy::fn_params_excessive_bools)] #[allow(clippy::single_match_else, clippy::fn_params_excessive_bools)]
@ -217,9 +216,7 @@ async fn init_script(
} }
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
@ -348,9 +345,7 @@ async fn init_project(
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// First, determine if there is an request for Python // First, determine if there is an request for Python
let python_request = if let Some(request) = python { let python_request = if let Some(request) = python {

14
crates/uv/src/commands/project/lock.rs
View File

@ -10,7 +10,7 @@ use rustc_hash::{FxBuildHasher, FxHashMap};
use tracing::debug; use tracing::debug;
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
Concurrency, Constraints, DependencyGroupsWithDefaults, DryRun, ExtrasSpecification, Preview, Concurrency, Constraints, DependencyGroupsWithDefaults, DryRun, ExtrasSpecification, Preview,
PreviewFeatures, Reinstall, Upgrade, PreviewFeatures, Reinstall, Upgrade,
@ -47,7 +47,7 @@ use crate::commands::project::{
use crate::commands::reporters::{PythonDownloadReporter, ResolverReporter}; use crate::commands::reporters::{PythonDownloadReporter, ResolverReporter};
use crate::commands::{ExitStatus, ScriptPath, diagnostics, pip}; use crate::commands::{ExitStatus, ScriptPath, diagnostics, pip};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverSettings}; use crate::settings::ResolverSettings;
/// The result of running a lock operation. /// The result of running a lock operation.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -100,9 +100,7 @@ pub(crate) async fn lock(
Some(ScriptPath::Path(path)) => { Some(ScriptPath::Path(path)) => {
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
let requires_python = init_script_python_requirement( let requires_python = init_script_python_requirement(
python.as_deref(), python.as_deref(),
@ -609,10 +607,8 @@ async fn do_lock(
// Initialize the client. // Initialize the client.
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(*keyring_provider);
.keyring(*keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
index_locations.cache_index_credentials(); index_locations.cache_index_credentials();

38
crates/uv/src/commands/project/mod.rs
View File

@ -10,7 +10,7 @@ use tracing::{debug, trace, warn};
use uv_cache::{Cache, CacheBucket}; use uv_cache::{Cache, CacheBucket};
use uv_cache_key::cache_digest; use uv_cache_key::cache_digest;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
Concurrency, Constraints, DependencyGroupsWithDefaults, DryRun, ExtrasSpecification, Preview, Concurrency, Constraints, DependencyGroupsWithDefaults, DryRun, ExtrasSpecification, Preview,
PreviewFeatures, Reinstall, Upgrade, PreviewFeatures, Reinstall, Upgrade,
@ -55,9 +55,7 @@ use crate::commands::pip::operations::{Changelog, Modifications};
use crate::commands::reporters::{PythonDownloadReporter, ResolverReporter}; use crate::commands::reporters::{PythonDownloadReporter, ResolverReporter};
use crate::commands::{capitalize, conjunction, pip}; use crate::commands::{capitalize, conjunction, pip};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{ use crate::settings::{InstallerSettingsRef, ResolverInstallerSettings, ResolverSettings};
InstallerSettingsRef, NetworkSettings, ResolverInstallerSettings, ResolverSettings,
};
pub(crate) mod add; pub(crate) mod add;
pub(crate) mod environment; pub(crate) mod environment;
@ -694,9 +692,7 @@ impl ScriptInterpreter {
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
@ -978,9 +974,7 @@ impl ProjectInterpreter {
let client_builder = BaseClientBuilder::default() let client_builder = BaseClientBuilder::default()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
@ -1709,10 +1703,8 @@ pub(crate) async fn resolve_names(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env() .retries_from_env()
.map_err(uv_requirements::Error::ClientError)? .map_err(uv_requirements::Error::ClientError)?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(*keyring_provider);
.keyring(*keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
index_locations.cache_index_credentials(); index_locations.cache_index_credentials();
@ -1876,10 +1868,8 @@ pub(crate) async fn resolve_environment(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(*keyring_provider);
.keyring(*keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Determine the tags, markers, and interpreter to use for resolution. // Determine the tags, markers, and interpreter to use for resolution.
let tags = interpreter.tags()?; let tags = interpreter.tags()?;
@ -2057,10 +2047,8 @@ pub(crate) async fn sync_environment(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let site_packages = SitePackages::from_environment(&venv)?; let site_packages = SitePackages::from_environment(&venv)?;
@ -2229,10 +2217,8 @@ pub(crate) async fn update_environment(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(*keyring_provider);
.keyring(*keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Respect all requirements from the provided sources. // Respect all requirements from the provided sources.
let RequirementsSpecification { let RequirementsSpecification {

3
crates/uv/src/commands/project/remove.rs
View File

@ -8,6 +8,7 @@ use owo_colors::OwoColorize;
use tracing::{debug, warn}; use tracing::{debug, warn};
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::NetworkSettings;
use uv_configuration::{ use uv_configuration::{
Concurrency, DependencyGroups, DryRun, EditableMode, ExtrasSpecification, InstallOptions, Concurrency, DependencyGroups, DryRun, EditableMode, ExtrasSpecification, InstallOptions,
Preview, Preview,
@ -35,7 +36,7 @@ use crate::commands::project::{
}; };
use crate::commands::{ExitStatus, diagnostics, project}; use crate::commands::{ExitStatus, diagnostics, project};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverInstallerSettings}; use crate::settings::ResolverInstallerSettings;
/// Remove one or more packages from the project requirements. /// Remove one or more packages from the project requirements.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]

24
crates/uv/src/commands/project/run.rs
View File

@ -16,7 +16,7 @@ use url::Url;
use uv_cache::Cache; use uv_cache::Cache;
use uv_cli::ExternalCommand; use uv_cli::ExternalCommand;
use uv_client::BaseClientBuilder; use uv_client::{BaseClientBuilder, NetworkSettings};
use uv_configuration::{ use uv_configuration::{
Concurrency, Constraints, DependencyGroups, DryRun, EditableMode, ExtrasSpecification, Concurrency, Constraints, DependencyGroups, DryRun, EditableMode, ExtrasSpecification,
InstallOptions, Preview, InstallOptions, Preview,
@ -70,7 +70,7 @@ use crate::commands::project::{
use crate::commands::reporters::PythonDownloadReporter; use crate::commands::reporters::PythonDownloadReporter;
use crate::commands::{ExitStatus, diagnostics, project}; use crate::commands::{ExitStatus, diagnostics, project};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverInstallerSettings}; use crate::settings::ResolverInstallerSettings;
/// Run a command. /// Run a command.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -634,9 +634,7 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
// base environment for the project. // base environment for the project.
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Resolve the Python request and requirement for the workspace. // Resolve the Python request and requirement for the workspace.
let WorkspacePython { let WorkspacePython {
@ -876,9 +874,7 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
let interpreter = { let interpreter = {
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// (1) Explicit request from user // (1) Explicit request from user
let python_request = if let Some(request) = python.as_deref() { let python_request = if let Some(request) = python.as_deref() {
@ -947,9 +943,7 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
} else { } else {
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let spec = let spec =
RequirementsSpecification::from_simple_sources(&requirements, &client_builder).await?; RequirementsSpecification::from_simple_sources(&requirements, &client_builder).await?;
@ -1623,9 +1617,7 @@ async fn resolve_gist_url(
let client = BaseClientBuilder::new() let client = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone())
.build(); .build();
// Build the request with appropriate headers. // Build the request with appropriate headers.
@ -1723,9 +1715,7 @@ impl RunCommand {
let client = BaseClientBuilder::new() let client = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings)
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone())
.build(); .build();
let response = client let response = client
.for_host(&url) .for_host(&url)

12
crates/uv/src/commands/project/sync.rs
View File

@ -10,7 +10,7 @@ use serde::Serialize;
use tracing::warn; use tracing::warn;
use uv_cache::Cache; use uv_cache::Cache;
use uv_cli::SyncFormat; use uv_cli::SyncFormat;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
Concurrency, Constraints, DependencyGroups, DependencyGroupsWithDefaults, DryRun, EditableMode, Concurrency, Constraints, DependencyGroups, DependencyGroupsWithDefaults, DryRun, EditableMode,
ExtrasSpecification, ExtrasSpecificationWithDefaults, HashCheckingMode, InstallOptions, ExtrasSpecification, ExtrasSpecificationWithDefaults, HashCheckingMode, InstallOptions,
@ -49,9 +49,7 @@ use crate::commands::project::{
}; };
use crate::commands::{ExitStatus, diagnostics}; use crate::commands::{ExitStatus, diagnostics};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{ use crate::settings::{InstallerSettingsRef, ResolverInstallerSettings, ResolverSettings};
InstallerSettingsRef, NetworkSettings, ResolverInstallerSettings, ResolverSettings,
};
/// Sync the project environment. /// Sync the project environment.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -643,10 +641,8 @@ pub(super) async fn do_sync(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings)
.native_tls(network_settings.native_tls) .keyring(keyring_provider);
.keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Validate that the Python version is supported by the lockfile. // Validate that the Python version is supported by the lockfile.
if !target if !target

8
crates/uv/src/commands/project/tree.rs
View File

@ -6,7 +6,7 @@ use futures::StreamExt;
use tokio::sync::Semaphore; use tokio::sync::Semaphore;
use uv_cache::{Cache, Refresh}; use uv_cache::{Cache, Refresh};
use uv_cache_info::Timestamp; use uv_cache_info::Timestamp;
use uv_client::RegistryClientBuilder; use uv_client::{NetworkSettings, RegistryClientBuilder};
use uv_configuration::{Concurrency, DependencyGroups, Preview, TargetTriple}; use uv_configuration::{Concurrency, DependencyGroups, Preview, TargetTriple};
use uv_distribution_types::IndexCapabilities; use uv_distribution_types::IndexCapabilities;
use uv_normalize::DefaultGroups; use uv_normalize::DefaultGroups;
@ -28,7 +28,7 @@ use crate::commands::project::{
use crate::commands::reporters::LatestVersionReporter; use crate::commands::reporters::LatestVersionReporter;
use crate::commands::{ExitStatus, diagnostics}; use crate::commands::{ExitStatus, diagnostics};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverSettings}; use crate::settings::ResolverSettings;
/// Run a command. /// Run a command.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -218,9 +218,7 @@ pub(crate) async fn tree(
cache.clone().with_refresh(Refresh::All(Timestamp::now())), cache.clone().with_refresh(Refresh::All(Timestamp::now())),
) )
.retries_from_env()? .retries_from_env()?
.native_tls(network_settings.native_tls) .network_settings(network_settings)
.connectivity(network_settings.connectivity)
.allow_insecure_host(network_settings.allow_insecure_host.clone())
.index_locations(index_locations) .index_locations(index_locations)
.keyring(*keyring_provider) .keyring(*keyring_provider)
.build(); .build();

3
crates/uv/src/commands/project/version.rs
View File

@ -9,6 +9,7 @@ use tracing::debug;
use uv_cache::Cache; use uv_cache::Cache;
use uv_cli::version::VersionInfo; use uv_cli::version::VersionInfo;
use uv_cli::{VersionBump, VersionFormat}; use uv_cli::{VersionBump, VersionFormat};
use uv_client::NetworkSettings;
use uv_configuration::{ use uv_configuration::{
Concurrency, DependencyGroups, DependencyGroupsWithDefaults, DryRun, EditableMode, Concurrency, DependencyGroups, DependencyGroupsWithDefaults, DryRun, EditableMode,
ExtrasSpecification, InstallOptions, Preview, ExtrasSpecification, InstallOptions, Preview,
@ -36,7 +37,7 @@ use crate::commands::project::{
}; };
use crate::commands::{ExitStatus, diagnostics, project}; use crate::commands::{ExitStatus, diagnostics, project};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverInstallerSettings}; use crate::settings::ResolverInstallerSettings;
/// Display version information for uv itself (`uv self version`) /// Display version information for uv itself (`uv self version`)
pub(crate) fn self_version( pub(crate) fn self_version(

12
crates/uv/src/commands/publish.rs
View File

@ -9,7 +9,9 @@ use tokio::sync::Semaphore;
use tracing::{debug, info, trace}; use tracing::{debug, info, trace};
use uv_auth::Credentials; use uv_auth::Credentials;
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::{AuthIntegration, BaseClient, BaseClientBuilder, RegistryClientBuilder}; use uv_client::{
AuthIntegration, BaseClient, BaseClientBuilder, NetworkSettings, RegistryClientBuilder,
};
use uv_configuration::{KeyringProviderType, TrustedPublishing}; use uv_configuration::{KeyringProviderType, TrustedPublishing};
use uv_distribution_types::{Index, IndexCapabilities, IndexLocations, IndexUrl}; use uv_distribution_types::{Index, IndexCapabilities, IndexLocations, IndexUrl};
use uv_publish::{ use uv_publish::{
@ -21,7 +23,6 @@ use uv_warnings::{warn_user_once, write_error_chain};
use crate::commands::reporters::PublishReporter; use crate::commands::reporters::PublishReporter;
use crate::commands::{ExitStatus, human_readable_bytes}; use crate::commands::{ExitStatus, human_readable_bytes};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
pub(crate) async fn publish( pub(crate) async fn publish(
paths: Vec<String>, paths: Vec<String>,
@ -59,8 +60,7 @@ pub(crate) async fn publish(
let upload_client = BaseClientBuilder::new() let upload_client = BaseClientBuilder::new()
.retries(0) .retries(0)
.keyring(keyring_provider) .keyring(keyring_provider)
.native_tls(network_settings.native_tls) .network_settings(network_settings)
.allow_insecure_host(network_settings.allow_insecure_host.clone())
// Don't try cloning the request to make an unauthenticated request first. // Don't try cloning the request to make an unauthenticated request first.
.auth_integration(AuthIntegration::OnlyAuthenticated) .auth_integration(AuthIntegration::OnlyAuthenticated)
// Set a very high timeout for uploads, connections are often 10x slower on upload than // Set a very high timeout for uploads, connections are often 10x slower on upload than
@ -95,9 +95,7 @@ pub(crate) async fn publish(
); );
let registry_client_builder = RegistryClientBuilder::new(cache.clone()) let registry_client_builder = RegistryClientBuilder::new(cache.clone())
.retries_from_env()? .retries_from_env()?
.native_tls(network_settings.native_tls) .network_settings(network_settings)
.connectivity(network_settings.connectivity)
.allow_insecure_host(network_settings.allow_insecure_host.clone())
.index_locations(&index_locations) .index_locations(&index_locations)
.keyring(keyring_provider); .keyring(keyring_provider);
Some(CheckUrlClient { Some(CheckUrlClient {

2
crates/uv/src/commands/python/find.rs
View File

@ -3,6 +3,7 @@ use std::fmt::Write;
use std::path::Path; use std::path::Path;
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::NetworkSettings;
use uv_configuration::{DependencyGroupsWithDefaults, Preview}; use uv_configuration::{DependencyGroupsWithDefaults, Preview};
use uv_fs::Simplified; use uv_fs::Simplified;
use uv_python::{ use uv_python::{
@ -18,7 +19,6 @@ use crate::commands::{
project::{ScriptInterpreter, WorkspacePython, validate_project_requires_python}, project::{ScriptInterpreter, WorkspacePython, validate_project_requires_python},
}; };
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Find a Python interpreter. /// Find a Python interpreter.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]

6
crates/uv/src/commands/python/install.rs
View File

@ -14,6 +14,7 @@ use owo_colors::{AnsiColors, OwoColorize};
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use tracing::{debug, trace}; use tracing::{debug, trace};
use uv_client::NetworkSettings;
use uv_configuration::{Preview, PreviewFeatures}; use uv_configuration::{Preview, PreviewFeatures};
use uv_fs::Simplified; use uv_fs::Simplified;
use uv_platform::{Arch, Libc}; use uv_platform::{Arch, Libc};
@ -36,7 +37,6 @@ use crate::commands::python::{ChangeEvent, ChangeEventKind};
use crate::commands::reporters::PythonDownloadReporter; use crate::commands::reporters::PythonDownloadReporter;
use crate::commands::{ExitStatus, elapsed}; use crate::commands::{ExitStatus, elapsed};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
#[derive(Debug, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Clone, PartialEq, Eq, Hash)]
struct InstallRequest { struct InstallRequest {
@ -393,9 +393,7 @@ pub(crate) async fn install(
// Download and unpack the Python versions concurrently // Download and unpack the Python versions concurrently
let client = uv_client::BaseClientBuilder::new() let client = uv_client::BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings)
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone())
.build(); .build();
let reporter = PythonDownloadReporter::new(printer, downloads.len() as u64); let reporter = PythonDownloadReporter::new(printer, downloads.len() as u64);
let mut tasks = FuturesUnordered::new(); let mut tasks = FuturesUnordered::new();

6
crates/uv/src/commands/python/pin.rs
View File

@ -22,7 +22,7 @@ use crate::commands::{
ExitStatus, project::find_requires_python, reporters::PythonDownloadReporter, ExitStatus, project::find_requires_python, reporters::PythonDownloadReporter,
}; };
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings; use uv_client::NetworkSettings;
/// Pin to a specific Python version. /// Pin to a specific Python version.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -117,9 +117,7 @@ pub(crate) async fn pin(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
let python = match PythonInstallation::find_or_download( let python = match PythonInstallation::find_or_download(

3
crates/uv/src/commands/self_update.rs
View File

@ -5,12 +5,11 @@ use axoupdater::{AxoUpdater, AxoupdateError, UpdateRequest};
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
use tracing::debug; use tracing::debug;
use uv_client::WrappedReqwestError; use uv_client::{NetworkSettings, WrappedReqwestError};
use uv_fs::Simplified; use uv_fs::Simplified;
use crate::commands::ExitStatus; use crate::commands::ExitStatus;
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
/// Attempt to update the uv binary. /// Attempt to update the uv binary.
pub(crate) async fn self_update( pub(crate) async fn self_update(

11
crates/uv/src/commands/tool/install.rs
View File

@ -38,7 +38,8 @@ use crate::commands::tool::common::{
use crate::commands::tool::{Target, ToolRequest}; use crate::commands::tool::{Target, ToolRequest};
use crate::commands::{diagnostics, reporters::PythonDownloadReporter}; use crate::commands::{diagnostics, reporters::PythonDownloadReporter};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverInstallerSettings, ResolverSettings}; use crate::settings::{ResolverInstallerSettings, ResolverSettings};
use uv_client::NetworkSettings;
/// Install a tool. /// Install a tool.
#[allow(clippy::fn_params_excessive_bools)] #[allow(clippy::fn_params_excessive_bools)]
@ -67,9 +68,7 @@ pub(crate) async fn install(
) -> Result<ExitStatus> { ) -> Result<ExitStatus> {
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
@ -99,9 +98,7 @@ pub(crate) async fn install(
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
// Parse the input requirement. // Parse the input requirement.
let request = ToolRequest::parse(&package, from.as_deref())?; let request = ToolRequest::parse(&package, from.as_deref())?;

6
crates/uv/src/commands/tool/run.rs
View File

@ -55,8 +55,8 @@ use crate::commands::tool::common::{matching_packages, refine_interpreter};
use crate::commands::tool::{Target, ToolRequest}; use crate::commands::tool::{Target, ToolRequest};
use crate::commands::{diagnostics, project::environment::CachedEnvironment}; use crate::commands::{diagnostics, project::environment::CachedEnvironment};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
use crate::settings::ResolverInstallerSettings; use crate::settings::ResolverInstallerSettings;
use uv_client::NetworkSettings;
/// The user-facing command used to invoke a tool run. /// The user-facing command used to invoke a tool run.
#[derive(Debug, Copy, Clone, PartialEq, Eq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@ -690,9 +690,7 @@ async fn get_or_create_environment(
) -> Result<(ToolRequirement, PythonEnvironment), ProjectError> { ) -> Result<(ToolRequirement, PythonEnvironment), ProjectError> {
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);

8
crates/uv/src/commands/tool/upgrade.rs
View File

@ -7,7 +7,7 @@ use std::str::FromStr;
use tracing::{debug, trace}; use tracing::{debug, trace};
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::BaseClientBuilder; use uv_client::{BaseClientBuilder, NetworkSettings};
use uv_configuration::{Concurrency, Constraints, DryRun, Preview}; use uv_configuration::{Concurrency, Constraints, DryRun, Preview};
use uv_distribution_types::{ExtraBuildRequires, Requirement}; use uv_distribution_types::{ExtraBuildRequires, Requirement};
use uv_fs::CWD; use uv_fs::CWD;
@ -33,7 +33,7 @@ use crate::commands::reporters::PythonDownloadReporter;
use crate::commands::tool::common::remove_entrypoints; use crate::commands::tool::common::remove_entrypoints;
use crate::commands::{ExitStatus, conjunction, tool::common::finalize_tool_install}; use crate::commands::{ExitStatus, conjunction, tool::common::finalize_tool_install};
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::{NetworkSettings, ResolverInstallerSettings}; use crate::settings::ResolverInstallerSettings;
/// Upgrade a tool. /// Upgrade a tool.
pub(crate) async fn upgrade( pub(crate) async fn upgrade(
@ -83,9 +83,7 @@ pub(crate) async fn upgrade(
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
let client_builder = BaseClientBuilder::new() let client_builder = BaseClientBuilder::new()
.retries_from_env()? .retries_from_env()?
.connectivity(network_settings.connectivity) .network_settings(&network_settings);
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let python_request = python.as_deref().map(PythonRequest::parse); let python_request = python.as_deref().map(PythonRequest::parse);

9
crates/uv/src/commands/venv.rs
View File

@ -8,7 +8,7 @@ use owo_colors::OwoColorize;
use thiserror::Error; use thiserror::Error;
use uv_cache::Cache; use uv_cache::Cache;
use uv_client::{BaseClientBuilder, FlatIndexClient, RegistryClientBuilder}; use uv_client::{BaseClientBuilder, FlatIndexClient, NetworkSettings, RegistryClientBuilder};
use uv_configuration::{ use uv_configuration::{
BuildOptions, Concurrency, ConfigSettings, Constraints, DependencyGroups, IndexStrategy, BuildOptions, Concurrency, ConfigSettings, Constraints, DependencyGroups, IndexStrategy,
KeyringProviderType, NoBinary, NoBuild, PackageConfigSettings, Preview, PreviewFeatures, KeyringProviderType, NoBinary, NoBuild, PackageConfigSettings, Preview, PreviewFeatures,
@ -37,7 +37,6 @@ use crate::commands::pip::operations::{Changelog, report_interpreter};
use crate::commands::project::{WorkspacePython, validate_project_requires_python}; use crate::commands::project::{WorkspacePython, validate_project_requires_python};
use crate::commands::reporters::PythonDownloadReporter; use crate::commands::reporters::PythonDownloadReporter;
use crate::printer::Printer; use crate::printer::Printer;
use crate::settings::NetworkSettings;
use super::project::default_dependency_groups; use super::project::default_dependency_groups;
@ -127,10 +126,7 @@ pub(crate) async fn venv(
// TODO(zanieb): We don't use [`BaseClientBuilder::retries_from_env`] here because it's a pain // TODO(zanieb): We don't use [`BaseClientBuilder::retries_from_env`] here because it's a pain
// to map into a miette diagnostic. We should just remove miette diagnostics here, we're not // to map into a miette diagnostic. We should just remove miette diagnostics here, we're not
// using them elsewhere. // using them elsewhere.
let client_builder = BaseClientBuilder::default() let client_builder = BaseClientBuilder::default().network_settings(network_settings);
.connectivity(network_settings.connectivity)
.native_tls(network_settings.native_tls)
.allow_insecure_host(network_settings.allow_insecure_host.clone());
let reporter = PythonDownloadReporter::single(printer); let reporter = PythonDownloadReporter::single(printer);
@ -232,7 +228,6 @@ pub(crate) async fn venv(
.index_locations(index_locations) .index_locations(index_locations)
.index_strategy(index_strategy) .index_strategy(index_strategy)
.keyring(keyring_provider) .keyring(keyring_provider)
.allow_insecure_host(network_settings.allow_insecure_host.clone())
.markers(interpreter.markers()) .markers(interpreter.markers())
.platform(interpreter.platform()) .platform(interpreter.platform())
.build(); .build();

25
crates/uv/src/settings.rs
View File

@ -19,13 +19,13 @@ use uv_cli::{
ToolUpgradeArgs, ToolUpgradeArgs,
options::{flag, resolver_installer_options, resolver_options}, options::{flag, resolver_installer_options, resolver_options},
}; };
use uv_client::Connectivity; use uv_client::{Connectivity, NetworkSettings};
use uv_configuration::{ use uv_configuration::{
BuildOptions, Concurrency, ConfigSettings, DependencyGroups, DryRun, EditableMode, BuildOptions, Concurrency, ConfigSettings, DependencyGroups, DryRun, EditableMode,
ExportFormat, ExtrasSpecification, HashCheckingMode, IndexStrategy, InstallOptions, ExportFormat, ExtrasSpecification, HashCheckingMode, IndexStrategy, InstallOptions,
KeyringProviderType, NoBinary, NoBuild, PackageConfigSettings, Preview, ProjectBuildBackend, KeyringProviderType, NoBinary, NoBuild, PackageConfigSettings, Preview, ProjectBuildBackend,
Reinstall, RequiredVersion, SourceStrategy, TargetTriple, TrustedHost, TrustedPublishing, Reinstall, RequiredVersion, SourceStrategy, TargetTriple, TrustedPublishing, Upgrade,
Upgrade, VersionControlSystem, VersionControlSystem,
}; };
use uv_distribution_types::{DependencyMetadata, Index, IndexLocations, IndexUrl, Requirement}; use uv_distribution_types::{DependencyMetadata, Index, IndexLocations, IndexUrl, Requirement};
use uv_install_wheel::LinkMode; use uv_install_wheel::LinkMode;
@ -74,7 +74,7 @@ pub(crate) struct GlobalSettings {
impl GlobalSettings { impl GlobalSettings {
/// Resolve the [`GlobalSettings`] from the CLI and filesystem configuration. /// Resolve the [`GlobalSettings`] from the CLI and filesystem configuration.
pub(crate) fn resolve(args: &GlobalArgs, workspace: Option<&FilesystemOptions>) -> Self { pub(crate) fn resolve(args: &GlobalArgs, workspace: Option<&FilesystemOptions>) -> Self {
let network_settings = NetworkSettings::resolve(args, workspace); let network_settings = resolve_network_settings(args, workspace);
let python_preference = resolve_python_preference(args, workspace); let python_preference = resolve_python_preference(args, workspace);
Self { Self {
required_version: workspace required_version: workspace
@ -158,16 +158,10 @@ fn resolve_python_preference(
} }
} }
/// The resolved network settings to use for any invocation of the CLI. pub(crate) fn resolve_network_settings(
#[derive(Debug, Clone)] args: &GlobalArgs,
pub(crate) struct NetworkSettings { workspace: Option<&FilesystemOptions>,
pub(crate) connectivity: Connectivity, ) -> NetworkSettings {
pub(crate) native_tls: bool,
pub(crate) allow_insecure_host: Vec<TrustedHost>,
}
impl NetworkSettings {
pub(crate) fn resolve(args: &GlobalArgs, workspace: Option<&FilesystemOptions>) -> Self {
let connectivity = if flag(args.offline, args.no_offline, "offline") let connectivity = if flag(args.offline, args.no_offline, "offline")
.combine(workspace.and_then(|workspace| workspace.globals.offline)) .combine(workspace.and_then(|workspace| workspace.globals.offline))
.unwrap_or(false) .unwrap_or(false)
@ -196,12 +190,11 @@ impl NetworkSettings {
.flatten(), .flatten(),
) )
.collect(); .collect();
Self { NetworkSettings {
connectivity, connectivity,
native_tls, native_tls,
allow_insecure_host, allow_insecure_host,
} }
}
} }
/// The resolved cache settings to use for any invocation of the CLI. /// The resolved cache settings to use for any invocation of the CLI.

8
crates/uv/tests/it/common/mod.rs
View File

@ -21,6 +21,7 @@ use regex::Regex;
use tokio::io::AsyncWriteExt; use tokio::io::AsyncWriteExt;
use uv_cache::{Cache, CacheBucket}; use uv_cache::{Cache, CacheBucket};
use uv_client::NetworkSettings;
use uv_configuration::Preview; use uv_configuration::Preview;
use uv_fs::Simplified; use uv_fs::Simplified;
use uv_python::managed::ManagedPythonInstallations; use uv_python::managed::ManagedPythonInstallations;
@ -1752,8 +1753,13 @@ pub async fn download_to_disk(url: &str, path: &Path) {
.map(|h| uv_configuration::TrustedHost::from_str(h).unwrap()) .map(|h| uv_configuration::TrustedHost::from_str(h).unwrap())
.collect(); .collect();
let network_settings = NetworkSettings {
allow_insecure_host: trusted_hosts,
..NetworkSettings::default()
};
let client = uv_client::BaseClientBuilder::new() let client = uv_client::BaseClientBuilder::new()
.allow_insecure_host(trusted_hosts) .network_settings(&network_settings)
.build(); .build();
let url = url.parse().unwrap(); let url = url.parse().unwrap();
let response = client let response = client