kreuzberg 4.0.7 → 4.1.0

data/vendor/kreuzberg/src/cache/mod.rs

@@ -1,844 +1,21 @@
 //! Generic cache implementation with lock poisoning recovery.
 //!
-//! # Lock Poisoning Handling
-//!
-//! This module uses `Arc<Mutex<T>>` for thread-safe state management and implements
-//! explicit lock poisoning recovery throughout all public methods:
-//!
-//! **What is lock poisoning?**
-//! - When a thread panics while holding a Mutex, the lock becomes "poisoned"
-//! - Rust marks the Mutex to indicate data may be in an inconsistent state
-//! - Subsequent lock attempts return `Err(PoisonError)` instead of acquiring the lock
-//!
-//! **Recovery strategy:**
-//! - All `.lock()` calls use `.map_err()` to convert `PoisonError` into `KreuzbergError::LockPoisoned`
-//! - The error propagates to callers via `Result` returns (never `.unwrap()` on locks)
-//! - Provides clear error messages indicating which mutex is poisoned
-//! - Follows CLAUDE.md requirement: "Lock poisoning must be handled - never `.unwrap()` on Mutex/RwLock"
-//!
-//! **Affected state:**
-//! - `processing_locks`: Tracks cache keys currently being processed (6 lock sites)
-//! - `deleting_files`: Prevents read-during-delete race conditions (3 lock sites)
-//!
-//! This approach ensures that lock poisoning (rare in practice) is surfaced to users
-//! rather than causing panics, maintaining system stability during concurrent operations.
-
-use crate::error::{KreuzbergError, Result};
-use ahash::AHasher;
-use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
-use std::fs;
-
-/// Cache key hash format width (32 hex digits for u64 hash)
-const CACHE_KEY_HASH_WIDTH: usize = 32;
-use std::hash::{Hash, Hasher};
-use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::{Arc, Mutex};
-use std::time::{SystemTime, UNIX_EPOCH};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CacheStats {
-    pub total_files: usize,
-    pub total_size_mb: f64,
-    pub available_space_mb: f64,
-    pub oldest_file_age_days: f64,
-    pub newest_file_age_days: f64,
-}
-
-#[derive(Debug, Clone)]
-struct CacheEntry {
-    path: PathBuf,
-    size: u64,
-    modified: SystemTime,
-}
-
-struct CacheScanResult {
-    stats: CacheStats,
-    entries: Vec<CacheEntry>,
-}
-
-pub struct GenericCache {
-    cache_dir: PathBuf,
-    cache_type: String,
-    max_age_days: f64,
-    max_cache_size_mb: f64,
-    min_free_space_mb: f64,
-    processing_locks: Arc<Mutex<HashSet<String>>>,
-    /// Tracks cache keys being deleted to prevent read-during-delete race conditions
-    deleting_files: Arc<Mutex<HashSet<PathBuf>>>,
-    /// Counter for triggering periodic cleanup (every 100 writes)
-    write_counter: Arc<AtomicUsize>,
-}
-
-impl GenericCache {
-    pub fn new(
-        cache_type: String,
-        cache_dir: Option<String>,
-        max_age_days: f64,
-        max_cache_size_mb: f64,
-        min_free_space_mb: f64,
-    ) -> Result<Self> {
-        let cache_dir_path = if let Some(dir) = cache_dir {
-            PathBuf::from(dir).join(&cache_type)
-        } else {
-            // OSError/RuntimeError must bubble up - system errors need user reports ~keep
-            std::env::current_dir()?.join(".kreuzberg").join(&cache_type)
-        };
-
-        fs::create_dir_all(&cache_dir_path)
-            .map_err(|e| KreuzbergError::cache(format!("Failed to create cache directory: {}", e)))?;
-
-        Ok(Self {
-            cache_dir: cache_dir_path,
-            cache_type,
-            max_age_days,
-            max_cache_size_mb,
-            min_free_space_mb,
-            processing_locks: Arc::new(Mutex::new(HashSet::new())),
-            deleting_files: Arc::new(Mutex::new(HashSet::new())),
-            write_counter: Arc::new(AtomicUsize::new(0)),
-        })
-    }
-
-    fn get_cache_path(&self, cache_key: &str) -> PathBuf {
-        self.cache_dir.join(format!("{}.msgpack", cache_key))
-    }
-
-    fn get_metadata_path(&self, cache_key: &str) -> PathBuf {
-        self.cache_dir.join(format!("{}.meta", cache_key))
-    }
-
-    fn is_valid(&self, cache_path: &Path, source_file: Option<&str>) -> bool {
-        if !cache_path.exists() {
-            return false;
-        }
-
-        if let Ok(metadata) = fs::metadata(cache_path)
-            && let Ok(modified) = metadata.modified()
-            && let Ok(elapsed) = SystemTime::now().duration_since(modified)
-        {
-            let age_days = elapsed.as_secs() as f64 / (24.0 * 3600.0);
-            if age_days > self.max_age_days {
-                return false;
-            }
-        }
-
-        if let Some(source_path) = source_file {
-            let Some(file_stem) = cache_path.file_stem().and_then(|s| s.to_str()) else {
-                return false;
-            };
-            let meta_path = self.get_metadata_path(file_stem);
-
-            if meta_path.exists() {
-                if let Ok(meta_metadata) = fs::metadata(&meta_path)
-                    && meta_metadata.len() == 16
-                    && let Ok(cached_meta_bytes) = fs::read(&meta_path)
-                {
-                    let cached_size = u64::from_le_bytes([
-                        cached_meta_bytes[0],
-                        cached_meta_bytes[1],
-                        cached_meta_bytes[2],
-                        cached_meta_bytes[3],
-                        cached_meta_bytes[4],
-                        cached_meta_bytes[5],
-                        cached_meta_bytes[6],
-                        cached_meta_bytes[7],
-                    ]);
-                    let cached_mtime = u64::from_le_bytes([
-                        cached_meta_bytes[8],
-                        cached_meta_bytes[9],
-                        cached_meta_bytes[10],
-                        cached_meta_bytes[11],
-                        cached_meta_bytes[12],
-                        cached_meta_bytes[13],
-                        cached_meta_bytes[14],
-                        cached_meta_bytes[15],
-                    ]);
-
-                    if let Ok(source_metadata) = fs::metadata(source_path) {
-                        let current_size = source_metadata.len();
-                        let Some(current_mtime) = source_metadata
-                            .modified()
-                            .ok()
-                            .and_then(|t| t.duration_since(UNIX_EPOCH).ok())
-                            .map(|d| d.as_secs())
-                        else {
-                            return false;
-                        };
-
-                        return cached_size == current_size && cached_mtime == current_mtime;
-                    }
-                }
-                return false;
-            }
-        }
-
-        true
-    }
-
-    fn save_metadata(&self, cache_key: &str, source_file: Option<&str>) {
-        if let Some(source_path) = source_file
-            && let Ok(metadata) = fs::metadata(source_path)
-        {
-            let size = metadata.len();
-            let Some(mtime) = metadata
-                .modified()
-                .ok()
-                .and_then(|t| t.duration_since(UNIX_EPOCH).ok())
-                .map(|d| d.as_secs())
-            else {
-                return;
-            };
-
-            let mut bytes = Vec::with_capacity(16);
-            bytes.extend_from_slice(&size.to_le_bytes());
-            bytes.extend_from_slice(&mtime.to_le_bytes());
-
-            let meta_path = self.get_metadata_path(cache_key);
-            // Cache metadata write failure - safe to ignore, cache is optional fallback ~keep
-            let _ = fs::write(meta_path, bytes);
-        }
-    }
-
-    #[cfg_attr(feature = "otel", tracing::instrument(
-        skip(self),
-        fields(
-            cache.hit = tracing::field::Empty,
-            cache.key = %cache_key,
-        )
-    ))]
-    pub fn get(&self, cache_key: &str, source_file: Option<&str>) -> Result<Option<Vec<u8>>> {
-        let cache_path = self.get_cache_path(cache_key);
-
-        {
-            let deleting = self
-                .deleting_files
-                .lock()
-                .map_err(|e| KreuzbergError::LockPoisoned(format!("Deleting files mutex poisoned: {}", e)))?;
-            if deleting.contains(&cache_path) {
-                #[cfg(feature = "otel")]
-                tracing::Span::current().record("cache.hit", false);
-                return Ok(None);
-            }
-        }
-
-        if !self.is_valid(&cache_path, source_file) {
-            #[cfg(feature = "otel")]
-            tracing::Span::current().record("cache.hit", false);
-            return Ok(None);
-        }
-
-        match fs::read(&cache_path) {
-            Ok(content) => {
-                #[cfg(feature = "otel")]
-                tracing::Span::current().record("cache.hit", true);
-                Ok(Some(content))
-            }
-            Err(_) => {
-                // Best-effort cleanup of corrupted cache files ~keep
-                if let Err(e) = fs::remove_file(&cache_path) {
-                    tracing::debug!("Failed to remove corrupted cache file: {}", e);
-                }
-                if let Err(e) = fs::remove_file(self.get_metadata_path(cache_key)) {
-                    tracing::debug!("Failed to remove corrupted metadata file: {}", e);
-                }
-                #[cfg(feature = "otel")]
-                tracing::Span::current().record("cache.hit", false);
-                Ok(None)
-            }
-        }
-    }
-
-    #[cfg_attr(feature = "otel", tracing::instrument(
-        skip(self, data),
-        fields(
-            cache.key = %cache_key,
-            cache.size_bytes = data.len(),
-        )
-    ))]
-    pub fn set(&self, cache_key: &str, data: Vec<u8>, source_file: Option<&str>) -> Result<()> {
-        let cache_path = self.get_cache_path(cache_key);
-
-        fs::write(&cache_path, &data)
-            .map_err(|e| KreuzbergError::cache(format!("Failed to write cache file: {}", e)))?;
-
-        self.save_metadata(cache_key, source_file);
-
-        let count = self.write_counter.fetch_add(1, Ordering::Relaxed);
-        if count.is_multiple_of(100)
-            && let Some(cache_path_str) = self.cache_dir.to_str()
-        {
-            // Cache cleanup failure - safe to ignore, cache is optional fallback ~keep
-            let _ = smart_cleanup_cache(
-                cache_path_str,
-                self.max_age_days,
-                self.max_cache_size_mb,
-                self.min_free_space_mb,
-            );
-        }
-
-        Ok(())
-    }
-
-    pub fn is_processing(&self, cache_key: &str) -> Result<bool> {
-        // OSError/RuntimeError must bubble up - system errors need user reports ~keep
-        let locks = self
-            .processing_locks
-            .lock()
-            .map_err(|e| KreuzbergError::LockPoisoned(format!("Processing locks mutex poisoned: {}", e)))?;
-        Ok(locks.contains(cache_key))
-    }
-
-    pub fn mark_processing(&self, cache_key: String) -> Result<()> {
-        // OSError/RuntimeError must bubble up - system errors need user reports ~keep
-        let mut locks = self
-            .processing_locks
-            .lock()
-            .map_err(|e| KreuzbergError::LockPoisoned(format!("Processing locks mutex poisoned: {}", e)))?;
-        locks.insert(cache_key);
-        Ok(())
-    }
-
-    pub fn mark_complete(&self, cache_key: &str) -> Result<()> {
-        // OSError/RuntimeError must bubble up - system errors need user reports ~keep
-        let mut locks = self
-            .processing_locks
-            .lock()
-            .map_err(|e| KreuzbergError::LockPoisoned(format!("Processing locks mutex poisoned: {}", e)))?;
-        locks.remove(cache_key);
-        Ok(())
-    }
-
-    /// Mark a file path as being deleted to prevent concurrent reads.
-    ///
-    /// # TOCTOU Race Condition
-    ///
-    /// There is a Time-Of-Check-To-Time-Of-Use (TOCTOU) race condition between:
-    /// 1. Iterating directory entries in `clear()` (getting path/metadata)
-    /// 2. Marking the file for deletion here
-    /// 3. Actually deleting the file
-    ///
-    /// **Race scenario:**
-    /// - Thread A: Begins iterating in `clear()`, gets path
-    /// - Thread B: Calls `get()`, checks `deleting_files` (not marked yet), proceeds
-    /// - Thread A: Calls `mark_for_deletion()` here
-    /// - Thread A: Deletes file with `fs::remove_file()`
-    /// - Thread B: Tries to read file, but it's already deleted
-    ///
-    /// **Why this is acceptable:**
-    /// - Cache operations are best-effort optimizations, not critical
-    /// - `get()` already handles file read failures gracefully (treats as cache miss)
-    /// - The worst case is a failed read → cache miss → recomputation
-    /// - No data corruption or invariant violations occur
-    /// - Alternative (atomic operation) would require complex locking impacting performance
-    fn mark_for_deletion(&self, path: &Path) -> Result<()> {
-        let mut deleting = self
-            .deleting_files
-            .lock()
-            .map_err(|e| KreuzbergError::LockPoisoned(format!("Deleting files mutex poisoned: {}", e)))?;
-        deleting.insert(path.to_path_buf());
-        Ok(())
-    }
-
-    /// Remove a file path from the deletion set
-    fn unmark_deletion(&self, path: &Path) -> Result<()> {
-        let mut deleting = self
-            .deleting_files
-            .lock()
-            .map_err(|e| KreuzbergError::LockPoisoned(format!("Deleting files mutex poisoned: {}", e)))?;
-        deleting.remove(&path.to_path_buf());
-        Ok(())
-    }
-
-    pub fn clear(&self) -> Result<(usize, f64)> {
-        let dir_path = &self.cache_dir;
-
-        if !dir_path.exists() {
-            return Ok((0, 0.0));
-        }
-
-        let mut removed_count = 0;
-        let mut removed_size = 0.0;
-
-        let read_dir = fs::read_dir(dir_path)
-            .map_err(|e| KreuzbergError::cache(format!("Failed to read cache directory: {}", e)))?;
-
-        for entry in read_dir {
-            let entry = match entry {
-                Ok(e) => e,
-                Err(e) => {
-                    tracing::debug!("Error reading entry: {}", e);
-                    continue;
-                }
-            };
-
-            let metadata = match entry.metadata() {
-                Ok(m) if m.is_file() => m,
-                _ => continue,
-            };
-
-            let path = entry.path();
-            if path.extension().and_then(|s| s.to_str()) != Some("msgpack") {
-                continue;
-            }
-
-            let size_mb = metadata.len() as f64 / (1024.0 * 1024.0);
-
-            // Mark file for deletion to prevent concurrent access ~keep
-            if let Err(e) = self.mark_for_deletion(&path) {
-                tracing::debug!("Failed to mark file for deletion: {} (continuing anyway)", e);
-            }
-
-            match fs::remove_file(&path) {
-                Ok(_) => {
-                    removed_count += 1;
-                    removed_size += size_mb;
-                    // Unmark after successful deletion ~keep
-                    if let Err(e) = self.unmark_deletion(&path) {
-                        tracing::debug!("Failed to unmark deleted file: {} (non-critical)", e);
-                    }
-                }
-                Err(e) => {
-                    tracing::debug!("Failed to remove {:?}: {}", path, e);
-                    // Unmark after failed deletion to allow retries ~keep
-                    if let Err(e) = self.unmark_deletion(&path) {
-                        tracing::debug!("Failed to unmark file after deletion error: {} (non-critical)", e);
-                    }
-                }
-            }
-        }
-
-        Ok((removed_count, removed_size))
-    }
-
-    pub fn get_stats(&self) -> Result<CacheStats> {
-        let cache_path_str = self
-            .cache_dir
-            .to_str()
-            .ok_or_else(|| KreuzbergError::validation("Cache directory path contains invalid UTF-8".to_string()))?;
-        get_cache_metadata(cache_path_str)
-    }
-
-    pub fn cache_dir(&self) -> &Path {
-        &self.cache_dir
-    }
-
-    pub fn cache_type(&self) -> &str {
-        &self.cache_type
-    }
-}
-
-/// Generate a deterministic cache key from configuration parameters.
-///
-/// # Algorithm
-///
-/// Uses ahash (non-cryptographic 64-bit hash) for performance. Cache keys are
-/// generated by:
-/// 1. Sorting key-value pairs by key (for determinism)
-/// 2. Concatenating as "key1=val1&key2=val2&..."
-/// 3. Hashing with ahash and formatting as 32-character hex
-///
-/// # Collision Probability
-///
-/// AHash produces 64-bit hashes, leading to birthday paradox collisions:
-/// - **~0.01%** probability at 1 million cache entries
-/// - **~1%** probability at 100 million entries
-/// - **~50%** probability at 4.3 billion (2^32) entries
-///
-/// For context: P(collision) ≈ n^2 / (2 * 2^64) where n = number of entries.
-///
-/// # Performance vs Security Trade-off
-///
-/// - **ahash**: ~10x faster than SHA256, sufficient for cache keys
-/// - **SHA256**: Collision-resistant but overkill for caching
-/// - **Practical risk**: Low for typical usage (< 1M entries)
-///
-/// # Impact of Collisions
-///
-/// If two different configurations hash to the same key:
-/// - One configuration reads the other's cached data
-/// - Results in incorrect data served from cache
-/// - Detected via metadata validation (size/mtime checks)
-///
-/// # Recommendations
-///
-/// - **< 1M entries**: ahash is safe and fast
-/// - **> 100M entries**: Monitor cache size, consider periodic clearing
-/// - **Critical data**: If collision risk is unacceptable, add SHA256 option
-///
-/// # Example
-///
-/// ```rust
-/// use kreuzberg::cache::generate_cache_key;
-///
-/// let parts = [("format", "pdf"), ("ocr", "true"), ("lang", "en")];
-/// let key = generate_cache_key(&parts);
-/// assert_eq!(key.len(), 32); // 64-bit hash as hex
-/// ```
-pub fn generate_cache_key(parts: &[(&str, &str)]) -> String {
-    if parts.is_empty() {
-        return "empty".to_string();
-    }
-
-    let mut sorted_parts: Vec<_> = parts.to_vec();
-    sorted_parts.sort_by_key(|(k, _)| *k);
-
-    let estimated_size = sorted_parts.iter().map(|(k, v)| k.len() + v.len() + 2).sum::<usize>();
-    let mut cache_str = String::with_capacity(estimated_size);
-
-    for (i, (key, val)) in sorted_parts.iter().enumerate() {
-        if i > 0 {
-            cache_str.push('&');
-        }
-        cache_str.push_str(&format!("{}={}", key, val));
-    }
-
-    let mut hasher = AHasher::default();
-    cache_str.hash(&mut hasher);
-    let hash = hasher.finish();
-
-    format!("{:0width$x}", hash, width = CACHE_KEY_HASH_WIDTH)
-}
-
-#[allow(unsafe_code)]
-pub fn get_available_disk_space(path: &str) -> Result<f64> {
-    #[cfg(unix)]
-    {
-        let path = Path::new(path);
-        let check_path = if path.exists() {
-            path
-        } else if let Some(parent) = path.parent() {
-            parent
-        } else {
-            Path::new("/")
-        };
-
-        use libc::{statvfs, statvfs as statvfs_struct};
-        use std::ffi::CString;
-
-        let path_str = check_path
-            .to_str()
-            .ok_or_else(|| KreuzbergError::validation("Path contains invalid UTF-8".to_string()))?;
-        let c_path = CString::new(path_str).map_err(|e| KreuzbergError::validation(format!("Invalid path: {}", e)))?;
-
-        let mut stat: statvfs_struct = unsafe { std::mem::zeroed() };
-
-        let result = unsafe { statvfs(c_path.as_ptr(), &mut stat) };
-
-        if result == 0 {
-            #[allow(clippy::unnecessary_cast)]
-            let available_bytes = stat.f_bavail as u64 * stat.f_frsize as u64;
-            Ok(available_bytes as f64 / (1024.0 * 1024.0))
-        } else {
-            tracing::debug!("Failed to get disk stats for {}: errno {}", path_str, result);
-            Ok(10000.0)
-        }
-    }
-
-    #[cfg(not(unix))]
-    {
-        let _ = path;
-        Ok(10000.0)
-    }
-}
-
-fn scan_cache_directory(cache_dir: &str) -> Result<CacheScanResult> {
-    let dir_path = Path::new(cache_dir);
-
-    if !dir_path.exists() {
-        return Ok(CacheScanResult {
-            stats: CacheStats {
-                total_files: 0,
-                total_size_mb: 0.0,
-                available_space_mb: get_available_disk_space(cache_dir)?,
-                oldest_file_age_days: 0.0,
-                newest_file_age_days: 0.0,
-            },
-            entries: Vec::new(),
-        });
-    }
-
-    let current_time = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_secs() as f64;
-
-    let read_dir =
-        fs::read_dir(dir_path).map_err(|e| KreuzbergError::cache(format!("Failed to read cache directory: {}", e)))?;
-
-    let mut total_size = 0u64;
-    let mut oldest_age = 0.0f64;
-    let mut newest_age = f64::INFINITY;
-    let mut entries = Vec::new();
-
-    for entry in read_dir {
-        let entry = match entry {
-            Ok(e) => e,
-            Err(e) => {
-                tracing::debug!("Error reading cache entry: {}", e);
-                continue;
-            }
-        };
-
-        let metadata = match entry.metadata() {
-            Ok(m) if m.is_file() => m,
-            _ => continue,
-        };
-
-        let path = entry.path();
-        if path.extension().and_then(|s| s.to_str()) != Some("msgpack") {
-            continue;
-        }
-
-        let modified = match metadata.modified() {
-            Ok(m) => m,
-            Err(e) => {
-                tracing::debug!("Error getting modification time for {:?}: {}", path, e);
-                continue;
-            }
-        };
-
-        let size = metadata.len();
-        total_size += size;
-
-        if let Ok(duration) = modified.duration_since(UNIX_EPOCH) {
-            let age_days = (current_time - duration.as_secs() as f64) / (24.0 * 3600.0);
-            oldest_age = oldest_age.max(age_days);
-            newest_age = newest_age.min(age_days);
-        }
-
-        entries.push(CacheEntry { path, size, modified });
-    }
-
-    if entries.is_empty() {
-        oldest_age = 0.0;
-        newest_age = 0.0;
-    }
-
-    Ok(CacheScanResult {
-        stats: CacheStats {
-            total_files: entries.len(),
-            total_size_mb: total_size as f64 / (1024.0 * 1024.0),
-            available_space_mb: get_available_disk_space(cache_dir)?,
-            oldest_file_age_days: oldest_age,
-            newest_file_age_days: newest_age,
-        },
-        entries,
-    })
-}
-
-pub fn get_cache_metadata(cache_dir: &str) -> Result<CacheStats> {
-    let scan_result = scan_cache_directory(cache_dir)?;
-    Ok(scan_result.stats)
-}
-
-pub fn cleanup_cache(
-    cache_dir: &str,
-    max_age_days: f64,
-    max_size_mb: f64,
-    target_size_ratio: f64,
-) -> Result<(usize, f64)> {
-    let scan_result = scan_cache_directory(cache_dir)?;
-
-    if scan_result.entries.is_empty() {
-        return Ok((0, 0.0));
-    }
-
-    let current_time = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_secs() as f64;
-    let max_age_seconds = max_age_days * 24.0 * 3600.0;
-
-    let mut removed_count = 0;
-    let mut removed_size = 0.0;
-    let mut remaining_entries = Vec::new();
-    let mut total_remaining_size = 0u64;
-
-    for entry in scan_result.entries {
-        if let Ok(age) = entry.modified.duration_since(UNIX_EPOCH) {
-            let age_seconds = current_time - age.as_secs() as f64;
-            if age_seconds > max_age_seconds {
-                match fs::remove_file(&entry.path) {
-                    Ok(_) => {
-                        removed_count += 1;
-                        removed_size += entry.size as f64 / (1024.0 * 1024.0);
-                    }
-                    Err(e) => {
-                        tracing::debug!("Failed to remove {:?}: {}", entry.path, e);
-                    }
-                }
-            } else {
-                total_remaining_size += entry.size;
-                remaining_entries.push(entry);
-            }
-        }
-    }
-
-    let mut total_size_mb = total_remaining_size as f64 / (1024.0 * 1024.0);
-
-    if total_size_mb > max_size_mb {
-        remaining_entries.sort_by_key(|e| e.modified);
-
-        let target_size = max_size_mb * target_size_ratio;
-
-        for entry in remaining_entries {
-            if total_size_mb <= target_size {
-                break;
-            }
-
-            match fs::remove_file(&entry.path) {
-                Ok(_) => {
-                    let size_mb = entry.size as f64 / (1024.0 * 1024.0);
-                    removed_count += 1;
-                    removed_size += size_mb;
-                    total_size_mb -= size_mb;
-                }
-                Err(e) => {
-                    tracing::debug!("Failed to remove {:?}: {}", entry.path, e);
-                }
-            }
-        }
-    }
-
-    Ok((removed_count, removed_size))
-}
-
-pub fn smart_cleanup_cache(
-    cache_dir: &str,
-    max_age_days: f64,
-    max_size_mb: f64,
-    min_free_space_mb: f64,
-) -> Result<(usize, f64)> {
-    let stats = get_cache_metadata(cache_dir)?;
-
-    let needs_cleanup = stats.available_space_mb < min_free_space_mb
-        || stats.total_size_mb > max_size_mb
-        || stats.oldest_file_age_days > max_age_days;
-
-    if !needs_cleanup {
-        return Ok((0, 0.0));
-    }
-
-    let target_ratio = if stats.available_space_mb < min_free_space_mb {
-        0.5
-    } else {
-        0.8
-    };
-
-    cleanup_cache(cache_dir, max_age_days, max_size_mb, target_ratio)
-}
-
-pub fn filter_old_cache_entries(cache_times: &[f64], current_time: f64, max_age_seconds: f64) -> Vec<usize> {
-    cache_times
-        .iter()
-        .enumerate()
-        .filter_map(|(idx, &time)| {
-            if current_time - time > max_age_seconds {
-                Some(idx)
-            } else {
-                None
-            }
-        })
-        .collect()
-}
-
-pub fn sort_cache_by_access_time(mut entries: Vec<(String, f64)>) -> Vec<String> {
-    entries.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal));
-    entries.into_iter().map(|(key, _)| key).collect()
-}
-
-pub fn fast_hash(data: &[u8]) -> u64 {
-    let mut hasher = AHasher::default();
-    data.hash(&mut hasher);
-    hasher.finish()
-}
-
-pub fn validate_cache_key(key: &str) -> bool {
-    key.len() == 32 && key.chars().all(|c| c.is_ascii_hexdigit())
-}
-
-pub fn is_cache_valid(cache_path: &str, max_age_days: f64) -> bool {
-    let path = Path::new(cache_path);
-
-    if !path.exists() {
-        return false;
-    }
-
-    match fs::metadata(path) {
-        Ok(metadata) => match metadata.modified() {
-            Ok(modified) => match SystemTime::now().duration_since(modified) {
-                Ok(elapsed) => {
-                    let age_days = elapsed.as_secs() as f64 / (24.0 * 3600.0);
-                    age_days <= max_age_days
-                }
-                Err(_) => false,
-            },
-            Err(_) => false,
-        },
-        Err(_) => false,
-    }
-}
-
-pub fn clear_cache_directory(cache_dir: &str) -> Result<(usize, f64)> {
-    let dir_path = Path::new(cache_dir);
-
-    if !dir_path.exists() {
-        return Ok((0, 0.0));
-    }
-
-    let mut removed_count = 0;
-    let mut removed_size = 0.0;
-
-    let read_dir =
-        fs::read_dir(dir_path).map_err(|e| KreuzbergError::cache(format!("Failed to read cache directory: {}", e)))?;
-
-    for entry in read_dir {
-        let entry = match entry {
-            Ok(e) => e,
-            Err(e) => {
-                tracing::debug!("Error reading entry: {}", e);
-                continue;
-            }
-        };
-
-        let metadata = match entry.metadata() {
-            Ok(m) if m.is_file() => m,
-            _ => continue,
-        };
-
-        let path = entry.path();
-        if path.extension().and_then(|s| s.to_str()) != Some("msgpack") {
-            continue;
-        }
-
-        let size_mb = metadata.len() as f64 / (1024.0 * 1024.0);
-        match fs::remove_file(&path) {
-            Ok(_) => {
-                removed_count += 1;
-                removed_size += size_mb;
-            }
-            Err(e) => {
-                tracing::debug!("Failed to remove {:?}: {}", path, e);
-            }
-        }
-    }
-
-    Ok((removed_count, removed_size))
-}
-
-pub fn batch_cleanup_caches(
-    cache_dirs: &[&str],
-    max_age_days: f64,
-    max_size_mb: f64,
-    min_free_space_mb: f64,
-) -> Result<Vec<(usize, f64)>> {
-    cache_dirs
-        .iter()
-        .map(|dir| smart_cleanup_cache(dir, max_age_days, max_size_mb, min_free_space_mb))
-        .collect()
-}
+//! This module provides a thread-safe caching system with automatic cleanup,
+//! processing locks, and validation capabilities.
+
+mod cleanup;
+mod core;
+mod utilities;
+
+// Re-export all public types and functions for backward compatibility
+pub use cleanup::{
+    batch_cleanup_caches, cleanup_cache, clear_cache_directory, get_cache_metadata, is_cache_valid, smart_cleanup_cache,
+};
+pub use core::{CacheStats, GenericCache};
+pub use utilities::{
+    fast_hash, filter_old_cache_entries, generate_cache_key, get_available_disk_space, sort_cache_by_access_time,
+    validate_cache_key,
+};
 
 #[cfg(test)]
 mod tests {
@@ -970,8 +147,8 @@ mod tests {
         )
         .unwrap();
 
-        assert_eq!(cache.cache_type, "test");
-        assert!(cache.cache_dir.exists());
+        assert_eq!(cache.cache_type(), "test");
+        assert!(cache.cache_dir().exists());
     }
 
     #[test]
@@ -1043,6 +220,7 @@ mod tests {
         assert_eq!(result, Some(data.clone()));
 
         sleep(Duration::from_millis(10));
+        use std::fs;
         let mut f = fs::OpenOptions::new()
             .write(true)
             .truncate(true)
@@ -1137,12 +315,12 @@ mod tests {
 
         let cache_key = "test_key";
 
-        let cache_path = cache.cache_dir.join(format!("{}.msgpack", cache_key));
+        let cache_path = cache.cache_dir().join(format!("{}.msgpack", cache_key));
         let mut f = File::create(&cache_path).unwrap();
         f.write_all(b"test data").unwrap();
         drop(f);
 
-        let old_time = SystemTime::now() - std::time::Duration::from_secs(60);
+        let old_time = std::time::SystemTime::now() - std::time::Duration::from_secs(60);
         filetime::set_file_mtime(&cache_path, filetime::FileTime::from_system_time(old_time)).unwrap();
 
         let result = cache.get(cache_key, None).unwrap();