Resolve with paths not just exe (#140)

For microsoft/vscode-python#23982

Author: DonJayamanne

.github/workflows/pr-check.yml

@@ -133,7 +133,7 @@ jobs:
         if: startsWith( matrix.os, 'ubuntu') || startsWith( matrix.os, 'macos')
         run: |
           pyenv install --list
-          pyenv install 3.12.4 3.8.19
+          pyenv install 3.12.5 3.8.19
         shell: bash
 
         # pyenv-win install list has not updated for a while

crates/pet/src/resolve.rs

@@ -12,7 +12,7 @@ use pet_core::{
     Locator,
 };
 use pet_env_var_path::get_search_paths_from_env_variables;
-use pet_python_utils::env::ResolvedPythonEnv;
+use pet_python_utils::{env::ResolvedPythonEnv, executable::find_executable};
 
 use crate::locators::identify_python_environment_using_locators;
 
@@ -27,6 +27,17 @@ pub fn resolve_environment(
     locators: &Arc<Vec<Arc<dyn Locator>>>,
     os_environment: &dyn Environment,
 ) -> Option<ResolvedEnvironment> {
+    // First check if executable is actually a file or a path.
+    let mut executable = executable.to_owned();
+    if executable.is_dir() {
+        executable = match find_executable(&executable) {
+            Some(exe) => exe,
+            None => {
+                warn!("Could not find Python executable in {:?}", executable);
+                executable
+            }
+        };
+    }
     // First check if this is a known environment
     let env = PythonEnv::new(executable.to_owned(), None, None);
     let global_env_search_paths: Vec<PathBuf> = get_search_paths_from_env_variables(os_environment);

crates/pet/tests/ci_homebrew_container.rs

@@ -50,7 +50,7 @@ fn verify_python_in_homebrew_contaner() {
     let python3_12 = PythonEnvironment {
         kind: Some(PythonEnvironmentKind::Homebrew),
         executable: Some(PathBuf::from("/home/linuxbrew/.linuxbrew/bin/python3")),
-        version: Some("3.12.4".to_string()), // This can change on CI, so we don't check it
+        version: Some("3.12.5".to_string()), // This can change on CI, so we don't check it
         symlinks: Some(vec![
             PathBuf::from("/home/linuxbrew/.linuxbrew/bin/python3"),
             PathBuf::from("/home/linuxbrew/.linuxbrew/bin/python3.12"),
@@ -61,7 +61,7 @@ fn verify_python_in_homebrew_contaner() {
             PathBuf::from("/home/linuxbrew/.linuxbrew/opt/python@3.12/bin/python3"),
             PathBuf::from("/home/linuxbrew/.linuxbrew/opt/python@3.12/bin/python3.12"),
             // On CI the Python version can change with minor updates, so we don't check the full version.
-            // PathBuf::from("/home/linuxbrew/.linuxbrew/Cellar/python@3.12/3.12.4/bin/python3.12"),
+            // PathBuf::from("/home/linuxbrew/.linuxbrew/Cellar/python@3.12/3.12.5/bin/python3.12"),
         ]),
         ..Default::default()
     };