feat: use shasum as cache key for venv

Signed-off-by: Nick Mitchell <[email protected]>

Author: starpit

pdl-live-react/src-tauri/Cargo.lock

@@ -27,11 +27,12 @@ serde_json = "1"
 tempdir = "0.3.7"
 urlencoding = "2.1.3"
 tempfile = "3.16.0"
-file_diff = "1.0.0"
 duct = "0.13.7"
 rayon = "1.10.0"
 yaml-rust2 = "0.10.0"
 futures = "0.3.31"
+sha2 = "0.10.8"
+base64ct = { version = "1.7.1", features = ["alloc"] }
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-cli = "2"

pdl-live-react/src-tauri/Cargo.toml

@@ -3,7 +3,7 @@ use duct::cmd;
 use futures::executor::block_on;
 use yaml_rust2::yaml::LoadError;
 
-use crate::interpreter::pip::pip_install_if_needed;
+use crate::interpreter::pip::pip_install_interpreter_if_needed;
 use crate::interpreter::pull::pull_if_needed;
 
 #[cfg(desktop)]
@@ -20,7 +20,7 @@ pub fn run_pdl_program(
     );
 
     let pull_future = pull_if_needed(&source_file_path);
-    let bin_path_future = pip_install_if_needed(app_handle);
+    let bin_path_future = pip_install_interpreter_if_needed(app_handle);
 
     let trace_arg = if let Some(arg) = trace_file {
         if let serde_json::Value::String(f) = &arg.value {

pdl-live-react/src-tauri/src/cli/run.rs

@@ -1,2 +1,3 @@
 pub mod pip;
 pub mod pull;
+pub mod shasum;

pdl-live-react/src-tauri/src/interpreter/mod.rs

@@ -1,31 +1,22 @@
 use ::std::fs::{copy, create_dir_all};
-use ::std::path::PathBuf;
+use ::std::path::{Path, PathBuf};
 
 use duct::cmd;
-use file_diff::diff;
 use tauri::path::BaseDirectory;
 use tauri::Manager;
 
-#[cfg(desktop)]
-pub async fn pip_install_if_needed(app_handle: tauri::AppHandle) -> Result<PathBuf, tauri::Error> {
-    let cache_path = app_handle.path().cache_dir()?.join("pdl");
+use crate::interpreter::shasum;
 
+#[cfg(desktop)]
+pub async fn pip_install_if_needed(
+    cache_path: &Path,
+    requirements_path: &Path,
+) -> Result<PathBuf, tauri::Error> {
     create_dir_all(&cache_path)?;
-    let venv_path = cache_path.join("interpreter-python");
-    let activate_path = if cfg!(windows) {
-        venv_path.join("Scripts").join("Activate.ps1")
-    } else {
-        venv_path.join("bin/activate")
-    };
-    let cached_requirements_path = venv_path
-        .join("requirements.txt")
-        .into_os_string()
-        .into_string()
-        .unwrap();
-    /* println!(
-        "RUN PATHS activate={:?} cached_reqs={:?}",
-        activate_path, cached_requirements_path
-    ); */
+
+    let hash = shasum::sha256sum(&requirements_path)?;
+    let venv_path = cache_path.join(hash);
+    let bin_path = venv_path.join(if cfg!(windows) { "Scripts" } else { "bin" });
 
     if !venv_path.exists() {
         println!("Creating virtual environment...");
@@ -35,34 +26,26 @@ pub async fn pip_install_if_needed(app_handle: tauri::AppHandle) -> Result<PathB
             "python3"
         };
         cmd!(python, "-mvenv", &venv_path).run()?;
+
+        cmd!(bin_path.join("pip"), "install", "-r", &requirements_path,).run()?;
+
+        let cached_requirements_path = venv_path.join("requirements.txt");
+        copy(requirements_path, cached_requirements_path)?;
     }
 
+    Ok(bin_path.to_path_buf())
+}
+
+#[cfg(desktop)]
+pub async fn pip_install_interpreter_if_needed(
+    app_handle: tauri::AppHandle,
+) -> Result<PathBuf, tauri::Error> {
+    // the interpreter requirements.txt
     let requirements_path = app_handle
         .path()
-        .resolve("interpreter/requirements.txt", BaseDirectory::Resource)?
-        .into_os_string()
-        .into_string()
-        .unwrap();
+        .resolve("interpreter/requirements.txt", BaseDirectory::Resource)?;
 
-    if !diff(
-        requirements_path.as_str(),
-        cached_requirements_path.as_str(),
-    ) {
-        cmd!(
-            venv_path
-                .join(if cfg!(windows) { "Scripts" } else { "bin" })
-                .join("pip"),
-            "install",
-            "-r",
-            &requirements_path,
-        )
-        .run()?;
-
-        copy(requirements_path, cached_requirements_path)?;
-    }
+    let cache_path = app_handle.path().cache_dir()?.join("pdl");
 
-    match activate_path.parent() {
-        Some(parent) => Ok(parent.to_path_buf()),
-        _ => Err(tauri::Error::UnknownPath),
-    }
+    pip_install_if_needed(&cache_path, &requirements_path).await
 }

pdl-live-react/src-tauri/src/interpreter/pip.rs

@@ -0,0 +1,16 @@
+use ::std::fs::File;
+use ::std::io::{copy, Result};
+use ::std::path::Path;
+
+use base64ct::{Base64, Encoding};
+use sha2::{Digest, Sha256};
+
+pub fn sha256sum(path: &Path) -> Result<String> {
+    let mut hasher = Sha256::new();
+    let mut file = File::open(path)?;
+
+    copy(&mut file, &mut hasher)?;
+    let hash_bytes = hasher.finalize();
+
+    Ok(Base64::encode_string(&hash_bytes))
+}