Add uv toolchain find

crates/uv-toolchain/src/lib.rs

@@ -6,6 +6,7 @@ pub use crate::discovery::{
     ToolchainSources, VersionRequest,
 };
 pub use crate::environment::PythonEnvironment;
+pub use crate::implementation::ImplementationName;
 pub use crate::interpreter::Interpreter;
 pub use crate::pointer_size::PointerSize;
 pub use crate::prefix::Prefix;

crates/uv-toolchain/src/toolchain.rs

@@ -33,7 +33,8 @@ impl Toolchain {
         cache: &Cache,
     ) -> Result<Self, Error> {
         if let Some(python) = python {
-            Self::find_requested(python, system, preview, cache)
+            let request = ToolchainRequest::parse(python);
+            Self::find_requested(&request, system, preview, cache)
         } else if system.is_preferred() {
             Self::find_default(preview, cache)
         } else {
@@ -60,14 +61,13 @@ impl Toolchain {
 
     /// Find an installed [`Toolchain`] that satisfies a request.
     pub fn find_requested(
-        request: &str,
+        request: &ToolchainRequest,
         system: SystemPython,
         preview: PreviewMode,
         cache: &Cache,
     ) -> Result<Self, Error> {
         let sources = ToolchainSources::from_settings(system, preview);
-        let request = ToolchainRequest::parse(request);
-        let toolchain = find_toolchain(&request, system, &sources, cache)??;
+        let toolchain = find_toolchain(request, system, &sources, cache)??;
 
         Ok(toolchain)
     }

crates/uv/src/cli.rs

@@ -1991,6 +1991,10 @@ pub(crate) enum ToolchainCommand {
 
     /// Download and install a specific toolchain.
     Install(ToolchainInstallArgs),
+
+    /// Search for a toolchain
+    #[command(disable_version_flag = true)]
+    Find(ToolchainFindArgs),
 }
 
 #[derive(Args)]
@@ -2014,6 +2018,18 @@ pub(crate) struct ToolchainInstallArgs {
     pub(crate) target: Option<String>,
 }
 
+#[derive(Args)]
+#[allow(clippy::struct_excessive_bools)]
+pub(crate) struct ToolchainFindArgs {
+    /// The version to find.
+    #[arg(long)]
+    pub(crate) version: Option<String>,
+
+    /// The implementation to find.
+    #[arg(long)]
+    pub(crate) implementation: Option<String>,
+}
+
 #[derive(Args)]
 pub(crate) struct IndexArgs {
     /// The URL of the Python package index (by default: <https://pypi.org/simple>).

crates/uv/src/commands/mod.rs

@@ -22,6 +22,7 @@ pub(crate) use project::sync::sync;
 #[cfg(feature = "self-update")]
 pub(crate) use self_update::self_update;
 pub(crate) use tool::run::run as run_tool;
+pub(crate) use toolchain::find::find as toolchain_find;
 pub(crate) use toolchain::install::install as toolchain_install;
 pub(crate) use toolchain::list::list as toolchain_list;
 use uv_cache::Cache;

crates/uv/src/commands/pip/compile.rs

@@ -161,7 +161,8 @@ pub(crate) async fn pip_compile(
         SystemPython::Allowed
     };
     let interpreter = if let Some(python) = python.as_ref() {
-        Toolchain::find_requested(python, system, preview, &cache)
+        let request = ToolchainRequest::parse(python);
+        Toolchain::find_requested(&request, system, preview, &cache)
     } else {
         // TODO(zanieb): The split here hints at a problem with the abstraction; we should be able to use
         // `Toolchain::find(...)` here.

crates/uv/src/commands/project/lock.rs

@@ -49,7 +49,8 @@ pub(crate) async fn lock(
                 if request.satisfied(&interpreter, cache) {
                     interpreter
                 } else {
-                    Toolchain::find_requested(python, SystemPython::Allowed, preview, cache)?
+                    let request = ToolchainRequest::parse(python);
+                    Toolchain::find_requested(&request, SystemPython::Allowed, preview, cache)?
                         .into_interpreter()
                 }
             } else {

crates/uv/src/commands/toolchain/mod.rs

@@ -1,2 +1,3 @@
+pub(crate) mod find;
 pub(crate) mod install;
 pub(crate) mod list;

crates/uv/src/main.rs

@@ -703,6 +703,24 @@ async fn run() -> Result<ExitStatus> {
             )
             .await
         }
+        Commands::Toolchain(ToolchainNamespace {
+            command: ToolchainCommand::Find(args),
+        }) => {
+            // Resolve the settings from the command-line arguments and workspace configuration.
+            let args = settings::ToolchainFindSettings::resolve(args, workspace);
+
+            // Initialize the cache.
+            let cache = cache.init()?;
+
+            commands::toolchain_find(
+                args.version,
+                args.implementation,
+                globals.preview,
+                &cache,
+                printer,
+            )
+            .await
+        }
     }
 }
 

crates/uv/src/settings.rs

@@ -23,7 +23,7 @@ use uv_workspace::{Combine, PipOptions, Workspace};
 use crate::cli::{
     ColorChoice, GlobalArgs, LockArgs, Maybe, PipCheckArgs, PipCompileArgs, PipFreezeArgs,
     PipInstallArgs, PipListArgs, PipShowArgs, PipSyncArgs, PipUninstallArgs, RunArgs, SyncArgs,
-    ToolRunArgs, ToolchainInstallArgs, ToolchainListArgs, VenvArgs,
+    ToolRunArgs, ToolchainFindArgs, ToolchainInstallArgs, ToolchainListArgs, VenvArgs,
 };
 use crate::commands::ListFormat;
 
@@ -266,7 +266,7 @@ impl ToolchainListSettings {
     }
 }
 
-/// The resolved settings to use for a `toolchain fetch` invocation.
+/// The resolved settings to use for a `toolchain install` invocation.
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Debug, Clone)]
 pub(crate) struct ToolchainInstallSettings {
@@ -283,6 +283,30 @@ impl ToolchainInstallSettings {
     }
 }
 
+/// The resolved settings to use for a `toolchain find` invocation.
+#[allow(clippy::struct_excessive_bools)]
+#[derive(Debug, Clone)]
+pub(crate) struct ToolchainFindSettings {
+    pub(crate) version: Option<String>,
+    pub(crate) implementation: Option<String>,
+}
+
+impl ToolchainFindSettings {
+    /// Resolve the [`ToolchainFindSettings`] from the CLI and workspace configuration.
+    #[allow(clippy::needless_pass_by_value)]
+    pub(crate) fn resolve(args: ToolchainFindArgs, _workspace: Option<Workspace>) -> Self {
+        let ToolchainFindArgs {
+            version,
+            implementation,
+        } = args;
+
+        Self {
+            version,
+            implementation,
+        }
+    }
+}
+
 /// The resolved settings to use for a `sync` invocation.
 #[allow(clippy::struct_excessive_bools, dead_code)]
 #[derive(Debug, Clone)]