refactored initialization.rs, consolidated to BridgeError.

Author: micahpw

crates/r2x-python/src/initialization.rs

@@ -69,33 +69,7 @@ impl Bridge {
 
         // Add site-packages from venv to sys.path so imports work as expected
         let venv_path = PathBuf::from(config.get_venv_path());
-
-        // TODO we can move this block and the next into utils.rs
-        let lib_dir = venv_path.join(PYTHON_LIB_DIR);
-        logger::debug(&format!(
-            "lib_dir: {}, exists: {}",
-            lib_dir.display(),
-            lib_dir.exists()
-        ));
-        if !lib_dir.exists() {
-            return Err(BridgeError::VenvNotFound(venv_path.to_path_buf()));
-        }
-
-        // Find the python3.X directory inside lib/
-        use std::fs;
-        let python_version_dir = fs::read_dir(&lib_dir)
-            .map_err(|e| {
-                BridgeError::Initialization(format!("Failed to read lib directory: {}", e))
-            })?
-            .filter_map(|e| e.ok())
-            .find(|e| e.file_name().to_string_lossy().starts_with("python"))
-            .ok_or_else(|| {
-                BridgeError::Initialization("No python3.X directory found in venv/lib".to_string())
-            })?;
-
-        let site_packages = resolve_site_package_path(&venv_path).map_err(|e| {
-            BridgeError::Initialization(format!("Failed to resolve site package path"))
-        })?;
+        let site_packages = resolve_site_package_path(&venv_path)?;
 
         logger::debug(&format!(
             "site_packages: {}, exists: {}",

crates/r2x-python/src/lib.rs

@@ -14,7 +14,7 @@ mod utils;
 
 pub use errors::BridgeError;
 pub use initialization::{configure_python_venv, Bridge};
-pub use utils::{resolve_site_package_path, PYTHON_BIN_DIR, PYTHON_EXE, PYTHON_LIB_DIR};
+pub use utils::{resolve_python_path, resolve_site_package_path};
 
 #[cfg(test)]
 mod tests {

crates/r2x-python/src/utils.rs

@@ -9,21 +9,21 @@ use std::path::PathBuf;
 
 /// The name of the library directory in a Python venv (e.g., "Lib" on Windows, "lib" on Unix)
 #[cfg(windows)]
-pub const PYTHON_LIB_DIR: &str = "Lib";
+const PYTHON_LIB_DIR: &str = "Lib";
 #[cfg(not(windows))]
-pub const PYTHON_LIB_DIR: &str = "lib";
+const PYTHON_LIB_DIR: &str = "lib";
 
 /// The name of the binaries/scripts directory in a Python venv (e.g., "Scripts" on Windows, "bin" on Unix)
 #[cfg(windows)]
-pub const PYTHON_BIN_DIR: &str = "Scripts";
+const PYTHON_BIN_DIR: &str = "Scripts";
 #[cfg(not(windows))]
-pub const PYTHON_BIN_DIR: &str = "bin";
+const PYTHON_BIN_DIR: &str = "bin";
 
 /// The name of the Python executable in a venv (e.g., "python.exe" on Windows, "python" on Unix)
 #[cfg(windows)]
-pub const PYTHON_EXE: &str = "python.exe";
+const PYTHON_EXE: &str = "python.exe";
 #[cfg(not(windows))]
-pub const PYTHON_EXE: &str = "python";
+const PYTHON_EXE: &str = "python";
 
 // Site Packages differences.
 //
@@ -33,10 +33,10 @@ pub const PYTHON_EXE: &str = "python";
 // Windows
 // .venv/Lib/site-packages
 
-pub fn resolve_site_package_path(venv_path: &PathBuf) -> Result<PathBuf, VenvErr> {
+pub fn resolve_site_package_path(venv_path: &PathBuf) -> Result<PathBuf, BridgeError> {
     // Verify the venv_path exists and is a directory.
     if !venv_path.is_dir() {
-        return Err(VenvErr::VenvDirNotFound);
+        return Err(BridgeError::VenvNotFound(venv_path.to_path_buf()));
     }
 
     #[cfg(windows)]
@@ -45,7 +45,10 @@ pub fn resolve_site_package_path(venv_path: &PathBuf) -> Result<PathBuf, VenvErr
 
         // verify site_package_path exists
         if !site_packages.is_dir() {
-            return Err(VenvErr::PackageDirNotFound);
+            return Err(BridgeError::Initialization(format!(
+                "unable to locate package directory: {}",
+                site_packages.display()
+            )));
         }
         Ok(site_packages)
     }
@@ -55,37 +58,48 @@ pub fn resolve_site_package_path(venv_path: &PathBuf) -> Result<PathBuf, VenvErr
         let lib_dir = venv_path.join(PYTHON_LIB_DIR);
 
         if !lib_dir.is_dir() {
-            return Err(VenvErr::LibDirNotFound);
+            return Err(BridgeError::Initialization(format!(
+                "unable to locate lib directory: {}",
+                lib_dir.display()
+            )));
         }
 
-        // FIXME Return a VenvError -> Map to BridgeError in Initialization process
-        let python_version_dir = std::fs::read_dir(&lib_dir)
-            .map_err(|e| format!("Failed to read lib directory: {}", e))?
+        let python_version_dir = fs::read_dir(&lib_dir)
+            .map_err(|e| {
+                BridgeError::Initialization(format!("Failed to read lib directory: {}", e))
+            })?
             .filter_map(|e| e.ok())
             .find(|e| e.file_name().to_string_lossy().starts_with("python"))
-            .ok_or_else(|| "No python directory found in venv".to_string())?;
+            .ok_or_else(|| {
+                BridgeError::Initialization("No python3.X directory found in venv/lib".to_string())
+            })?;
 
         let site_packages = python_version_dir.path().join("site-packages");
 
         if !site_packages.is_dir() {
-            return Err(VenvErr::LibDirNotFound);
+            return Err(BridgeError::Initialization(format!(
+                "unable to locate package directory: {}",
+                site_packages.display()
+            )));
         }
 
         Ok(site_packages)
     }
 }
 
-pub fn resolve_python_path(venv_path: &PathBuf) -> Result<PathBuf, VenvErr> {
+pub fn resolve_python_path(venv_path: &PathBuf) -> Result<PathBuf, BridgeError> {
     // validate venv path is a valid directory
     if !venv_path.is_dir() {
-        return Err(VenvErr::VenvDirNotFound);
+        return Err(BridgeError::VenvNotFound(venv_path.to_path_buf()));
     }
 
     let python_path = venv_path.join(PYTHON_BIN_DIR).join(PYTHON_EXE);
-
     // validate the interpreter path is valid
     if !python_path.is_file() {
-        return Err(VenvErr::BinaryNotFound);
+        return Err(BridgeError::Initialization(format!(
+            "Path to python binary is not valid: {}",
+            python_path.display()
+        )));
     }
 
     return Ok(python_path);