chore: sync issue #504 with main

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: karthiknadig

crates/pet-python-utils/src/cache.rs

@@ -6,14 +6,17 @@ use log::{trace, warn};
 use std::{
     collections::{hash_map::Entry, HashMap, HashSet},
     io,
-    path::PathBuf,
+    path::{Path, PathBuf},
     sync::{Arc, Mutex},
     time::SystemTime,
 };
 
 use crate::{
     env::ResolvedPythonEnv,
-    fs_cache::{delete_cache_file, get_cache_from_file, store_cache_in_file},
+    fs_cache::{
+        delete_cache_file, executable_cache_key, executable_cache_key_from, get_cache_from_file,
+        store_cache_in_file,
+    },
 };
 
 lazy_static! {
@@ -22,6 +25,10 @@ lazy_static! {
 
 pub trait CacheEntry: Send + Sync {
     fn get(&self) -> Option<ResolvedPythonEnv>;
+    fn get_for_executable(&self, executable: &Path) -> Option<ResolvedPythonEnv> {
+        self.get()
+            .map(|environment| add_executable_alias(environment, executable))
+    }
     fn store(&self, environment: ResolvedPythonEnv);
     fn track_symlinks(&self, symlinks: Vec<PathBuf>);
 }
@@ -102,6 +109,7 @@ impl CacheImpl {
         }
     }
     fn create_cache(&self, executable: PathBuf) -> LockableCacheEntry {
+        let cache_key = executable_cache_key(&executable);
         let cache_directory = self
             .cache_dir
             .lock()
@@ -111,11 +119,11 @@ impl CacheImpl {
             .locks
             .lock()
             .expect("locks mutex poisoned")
-            .entry(executable.clone())
+            .entry(cache_key.clone())
         {
             Entry::Occupied(lock) => lock.get().clone(),
             Entry::Vacant(lock) => {
-                let cache = Box::new(CacheEntryImpl::create(cache_directory.clone(), executable))
+                let cache = Box::new(CacheEntryImpl::create(cache_directory.clone(), cache_key))
                     as Box<dyn CacheEntry + 'static>;
                 lock.insert(Arc::new(Mutex::new(cache))).clone()
             }
@@ -129,6 +137,83 @@ impl CacheImpl {
 /// See: https://github.com/microsoft/python-environment-tools/issues/223
 type FilePathWithMTimeCTime = (PathBuf, SystemTime, Option<SystemTime>);
 
+fn current_dir_for_aliases(aliases: &[PathBuf]) -> Option<PathBuf> {
+    aliases
+        .iter()
+        .any(|alias| alias.is_relative())
+        .then(std::env::current_dir)
+        .transpose()
+        .ok()
+        .flatten()
+}
+
+fn add_executable_alias(
+    mut environment: ResolvedPythonEnv,
+    executable: &Path,
+) -> ResolvedPythonEnv {
+    let aliases = environment.symlinks.get_or_insert_with(Vec::new);
+    if !aliases.iter().any(|alias| alias == executable) {
+        aliases.push(executable.to_path_buf());
+        aliases.sort();
+        aliases.dedup();
+    }
+    environment
+}
+
+fn current_dir_for_cached_aliases(
+    environment: &ResolvedPythonEnv,
+    executable: &Path,
+) -> Option<PathBuf> {
+    current_dir_for_cached_aliases_with(environment, executable, std::env::current_dir)
+}
+
+fn current_dir_for_cached_aliases_with(
+    environment: &ResolvedPythonEnv,
+    executable: &Path,
+    current_dir: impl FnOnce() -> io::Result<PathBuf>,
+) -> Option<PathBuf> {
+    environment
+        .symlinks
+        .as_ref()
+        .is_some_and(|aliases| {
+            aliases
+                .iter()
+                .any(|alias| alias.is_relative() && alias != executable)
+        })
+        .then(current_dir)
+        .transpose()
+        .ok()
+        .flatten()
+}
+
+fn bind_validated_executable_alias(
+    mut environment: ResolvedPythonEnv,
+    executable: &Path,
+    tracked_aliases: &[FilePathWithMTimeCTime],
+    current_dir: Option<&Path>,
+) -> ResolvedPythonEnv {
+    let aliases = environment.symlinks.get_or_insert_with(Vec::new);
+    aliases.retain(|alias| {
+        if alias == executable {
+            return true;
+        }
+        if tracked_aliases.iter().any(|tracked| tracked.0 == *alias) {
+            return true;
+        }
+        if alias.is_relative() && current_dir.is_none() {
+            return false;
+        }
+        let key = executable_cache_key_from(alias, current_dir);
+        tracked_aliases.iter().any(|tracked| tracked.0 == key)
+    });
+    if !aliases.iter().any(|alias| alias == executable) {
+        aliases.push(executable.to_path_buf());
+    }
+    aliases.sort();
+    aliases.dedup();
+    environment
+}
+
 struct CacheEntryImpl {
     cache_directory: Option<PathBuf>,
     executable: PathBuf,
@@ -146,37 +231,35 @@ impl CacheEntryImpl {
         }
     }
     pub fn verify_in_memory_cache(&self) {
-        // Check if any of the exes have changed since we last cached this.
-        for symlink_info in self
+        let cache_is_valid = self
             .symlinks
             .lock()
             .expect("symlinks mutex poisoned")
             .iter()
-        {
-            if let Ok(metadata) = symlink_info.0.metadata() {
-                let mtime_changed = metadata.modified().ok() != Some(symlink_info.1);
-                // Only check ctime if we have it stored (may be None on Linux)
-                let ctime_changed = match symlink_info.2 {
-                    Some(stored_ctime) => metadata.created().ok() != Some(stored_ctime),
-                    None => false, // Can't check ctime if we don't have it
-                };
-                if mtime_changed || ctime_changed {
-                    trace!(
-                        "Symlink {:?} has changed since we last cached it. original mtime & ctime {:?}, {:?}, current mtime & ctime {:?}, {:?}",
-                        symlink_info.0,
-                        symlink_info.1,
-                        symlink_info.2,
-                        metadata.modified().ok(),
-                        metadata.created().ok()
-                    );
-                    self.envoronment
-                        .lock()
-                        .expect("envoronment mutex poisoned")
-                        .take();
-                    if let Some(cache_directory) = &self.cache_directory {
-                        delete_cache_file(cache_directory, &self.executable);
-                    }
+            .all(|symlink_info| {
+                if let Ok(metadata) = symlink_info.0.metadata() {
+                    let mtime_changed = metadata.modified().ok() != Some(symlink_info.1);
+                    let ctime_changed = match symlink_info.2 {
+                        Some(stored_ctime) => metadata.created().ok() != Some(stored_ctime),
+                        None => false,
+                    };
+                    !mtime_changed && !ctime_changed
+                } else {
+                    false
                 }
+            });
+
+        if !cache_is_valid {
+            trace!(
+                "Tracked executable changed or disappeared for {:?}",
+                self.executable
+            );
+            self.envoronment
+                .lock()
+                .expect("envoronment mutex poisoned")
+                .take();
+            if let Some(cache_directory) = &self.cache_directory {
+                delete_cache_file(cache_directory, &self.executable);
             }
         }
     }
@@ -213,16 +296,31 @@ impl CacheEntry for CacheEntryImpl {
         }
     }
 
+    fn get_for_executable(&self, executable: &Path) -> Option<ResolvedPythonEnv> {
+        let environment = self.get()?;
+        let current_dir = current_dir_for_cached_aliases(&environment, executable);
+        let tracked_aliases = self.symlinks.lock().expect("symlinks mutex poisoned");
+        Some(bind_validated_executable_alias(
+            environment,
+            executable,
+            &tracked_aliases,
+            current_dir.as_deref(),
+        ))
+    }
+
     fn store(&self, environment: ResolvedPythonEnv) {
         // Get hold of the mtimes and ctimes of the symlinks.
+        let aliases = environment.symlinks.clone().unwrap_or_default();
+        let current_dir = current_dir_for_aliases(&aliases);
         let mut symlinks = vec![];
-        for symlink in environment.symlinks.clone().unwrap_or_default().iter() {
+        for alias in &aliases {
+            let symlink = executable_cache_key_from(alias, current_dir.as_deref());
             if let Ok(metadata) = symlink.metadata() {
                 // We require mtime, but ctime is optional (not available on all Linux filesystems)
                 // See: https://github.com/microsoft/python-environment-tools/issues/223
                 if let Ok(modified) = metadata.modified() {
                     let created = metadata.created().ok(); // May be None on Linux
-                    symlinks.push((symlink.clone(), modified, created));
+                    symlinks.push((symlink, modified, created));
                 }
             }
         }
@@ -259,8 +357,12 @@ impl CacheEntry for CacheEntryImpl {
             .iter()
             .map(|x| x.0.clone())
             .collect();
-
-        if symlinks.iter().all(|x| known_symlinks.contains(x)) {
+        let current_dir = current_dir_for_aliases(&symlinks);
+        if symlinks
+            .iter()
+            .map(|alias| executable_cache_key_from(alias, current_dir.as_deref()))
+            .all(|key| known_symlinks.contains(&key))
+        {
             return;
         }
 
@@ -283,3 +385,142 @@ impl CacheEntry for CacheEntryImpl {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    use tempfile::tempdir_in;
+
+    fn environment(executable: PathBuf, aliases: Vec<PathBuf>) -> ResolvedPythonEnv {
+        ResolvedPythonEnv {
+            executable,
+            prefix: PathBuf::from("prefix"),
+            version: "3.12.0".to_string(),
+            is64_bit: true,
+            symlinks: Some(aliases),
+        }
+    }
+
+    fn aliases() -> (tempfile::TempDir, PathBuf, PathBuf) {
+        let current_dir = std::env::current_dir().unwrap();
+        let temp_dir = tempdir_in(&current_dir).unwrap();
+        let absolute = temp_dir.path().join("python");
+        std::fs::write(&absolute, "python").unwrap();
+        let relative = absolute.strip_prefix(&current_dir).unwrap().to_path_buf();
+        (temp_dir, relative, absolute)
+    }
+
+    #[test]
+    fn relative_and_absolute_aliases_share_in_memory_entry() {
+        let (_temp_dir, relative, absolute) = aliases();
+        let cache = CacheImpl::new(None);
+
+        let relative_entry = cache.create_cache(relative);
+        let absolute_entry = cache.create_cache(absolute);
+
+        assert!(Arc::ptr_eq(&relative_entry, &absolute_entry));
+    }
+
+    #[test]
+    fn cache_hit_preserves_canonical_executable_and_current_aliases() {
+        let (temp_dir, relative, absolute) = aliases();
+        let canonical = temp_dir.path().join("canonical-python");
+        std::fs::write(&canonical, "python").unwrap();
+        let cache = CacheImpl::new(None);
+        let entry = cache.create_cache(relative.clone());
+        let entry = entry.lock().unwrap();
+        entry.store(environment(
+            canonical.clone(),
+            vec![relative.clone(), absolute.clone(), canonical.clone()],
+        ));
+
+        let relative_hit = entry.get_for_executable(&relative).unwrap();
+        assert_eq!(relative_hit.executable, canonical);
+
+        let absolute_hit = entry.get_for_executable(&absolute).unwrap();
+        assert_eq!(absolute_hit.executable, canonical);
+        let hit_aliases = absolute_hit.symlinks.unwrap();
+        assert!(hit_aliases.contains(&relative));
+        assert!(hit_aliases.contains(&absolute));
+        assert!(hit_aliases.contains(&canonical));
+    }
+
+    #[test]
+    fn disk_cache_reuses_relative_entry_for_absolute_alias() {
+        let (temp_dir, relative, absolute) = aliases();
+        let canonical = temp_dir.path().join("canonical-python");
+        std::fs::write(&canonical, "python").unwrap();
+        let cache_directory = temp_dir.path().join("cache");
+        {
+            let cache = CacheImpl::new(Some(cache_directory.clone()));
+            let entry = cache.create_cache(relative.clone());
+            entry.lock().unwrap().store(environment(
+                canonical.clone(),
+                vec![relative.clone(), absolute.clone(), canonical.clone()],
+            ));
+        }
+
+        let cache = CacheImpl::new(Some(cache_directory));
+        let entry = cache.create_cache(absolute.clone());
+        let hit = entry.lock().unwrap().get_for_executable(&absolute).unwrap();
+
+        assert_eq!(hit.executable, canonical);
+        let hit_aliases = hit.symlinks.unwrap();
+        assert!(hit_aliases.contains(&relative));
+        assert!(hit_aliases.contains(&absolute));
+        assert!(hit_aliases.contains(&canonical));
+    }
+
+    #[test]
+    fn stale_relative_alias_from_another_working_directory_is_dropped() {
+        let (temp_dir, relative, absolute) = aliases();
+        let metadata = absolute.metadata().unwrap();
+        let tracked_aliases = vec![(
+            absolute.clone(),
+            metadata.modified().unwrap(),
+            metadata.created().ok(),
+        )];
+        let stale_working_directory = temp_dir.path().join("another-workspace");
+
+        let hit = bind_validated_executable_alias(
+            environment(absolute.clone(), vec![relative.clone(), absolute.clone()]),
+            &absolute,
+            &tracked_aliases,
+            Some(&stale_working_directory),
+        );
+
+        let hit_aliases = hit.symlinks.unwrap();
+        assert!(!hit_aliases.contains(&relative));
+        assert!(hit_aliases.contains(&absolute));
+    }
+
+    #[test]
+    fn absolute_cache_hit_does_not_query_current_directory() {
+        let (_temp_dir, _relative, absolute) = aliases();
+        let current_dir_calls = AtomicUsize::new(0);
+        let environment = environment(absolute.clone(), vec![absolute.clone()]);
+
+        let current_dir = current_dir_for_cached_aliases_with(&environment, &absolute, || {
+            current_dir_calls.fetch_add(1, Ordering::Relaxed);
+            std::env::current_dir()
+        });
+
+        assert!(current_dir.is_none());
+        assert_eq!(current_dir_calls.load(Ordering::Relaxed), 0);
+    }
+
+    #[test]
+    fn missing_tracked_executable_invalidates_in_memory_entry() {
+        let (temp_dir, _relative, absolute) = aliases();
+        let cache = CacheImpl::new(Some(temp_dir.path().join("cache")));
+        let entry = cache.create_cache(absolute.clone());
+        let entry = entry.lock().unwrap();
+        entry.store(environment(absolute.clone(), vec![absolute.clone()]));
+        assert!(entry.get().is_some());
+
+        std::fs::remove_file(&absolute).unwrap();
+
+        assert!(entry.get().is_none());
+    }
+}

crates/pet-python-utils/src/env.rs

@@ -84,7 +84,7 @@ impl ResolvedPythonEnv {
     ) -> Option<Self> {
         let cache = create_cache(executable.to_path_buf());
         let entry = cache.lock().expect("cache mutex poisoned");
-        if let Some(env) = entry.get() {
+        if let Some(env) = entry.get_for_executable(executable) {
             Some(env)
         } else if let Some(env) = get_interpreter_details(executable) {
             entry.store(env.clone());