work in progress

Author: micahpw

crates/r2x-python/src/initialization.rs

@@ -3,7 +3,7 @@
 //! This module handles all Python interpreter initialization, virtual environment
 //! configuration, and environment setup required before the bridge can be used.
 
-use super::utils::*;
+use super::utils::{resolve_python_path, resolve_site_package_path};
 use crate::errors::BridgeError;
 use once_cell::sync::OnceCell;
 use pyo3::prelude::*;
@@ -70,6 +70,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: {}",
@@ -320,7 +321,13 @@ pub fn configure_python_venv() -> Result<PathBuf, BridgeError> {
 
     let venv_path = PathBuf::from(config.get_venv_path());
 
-    let python_path = venv_path.join(PYTHON_BIN_DIR).join(PYTHON_EXE);
+    let python_path_result = resolve_python_path(&venv_path);
+
+    if python_path_result.is_err() {
+        logger::debug("Could not resolve Python path");
+    }
+
+    let python_path = python_path_result.unwrap_or_else(|_| PathBuf::new());
 
     // Create venv if it doesn't exist
     if !venv_path.exists() || !python_path.exists() {

crates/r2x-python/src/utils.rs

@@ -3,18 +3,10 @@
 //! This module provides compile-time constants for directories and files that differ
 //! between Windows and Unix-like systems in Python virtual environments.
 
+use super::errors::BridgeError;
+use std::fs;
 use std::path::PathBuf;
 
-#[derive(Debug)]
-pub enum VenvErr {
-    BinaryNotFound,
-    PackageNotFound,
-    PackageDirNotFound,
-    LibDirNotFound,
-    VenvDirNotFound,
-    IOError(std::io::Error),
-}
-
 /// 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";
@@ -66,6 +58,7 @@ pub fn resolve_site_package_path(venv_path: &PathBuf) -> Result<PathBuf, VenvErr
             return Err(VenvErr::LibDirNotFound);
         }
 
+        // 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))?
             .filter_map(|e| e.ok())
@@ -81,3 +74,19 @@ pub fn resolve_site_package_path(venv_path: &PathBuf) -> Result<PathBuf, VenvErr
         Ok(site_packages)
     }
 }
+
+pub fn resolve_python_path(venv_path: &PathBuf) -> Result<PathBuf, VenvErr> {
+    // validate venv path is a valid directory
+    if !venv_path.is_dir() {
+        return Err(VenvErr::VenvDirNotFound);
+    }
+
+    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 Ok(python_path);
+}