fix: improved storage manager, prep for s3

html-router/src/html_state.rs

@@ -1,4 +1,4 @@
-use common::storage::db::SurrealDbClient;
+use common::storage::{db::SurrealDbClient, store::StorageManager};
 use common::utils::template_engine::{ProvidesTemplateEngine, TemplateEngine};
 use common::{create_template_engine, storage::db::ProvidesDb, utils::config::AppConfig};
 use composite_retrieval::reranking::RerankerPool;
@@ -14,14 +14,16 @@ pub struct HtmlState {
     pub templates: Arc<TemplateEngine>,
     pub session_store: Arc<SessionStoreType>,
     pub config: AppConfig,
+    pub storage: StorageManager,
     pub reranker_pool: Option<Arc<RerankerPool>>,
 }
 
 impl HtmlState {
-    pub fn new_with_resources(
+    pub async fn new_with_resources(
         db: Arc<SurrealDbClient>,
         openai_client: Arc<OpenAIClientType>,
         session_store: Arc<SessionStoreType>,
+        storage: StorageManager,
         config: AppConfig,
         reranker_pool: Option<Arc<RerankerPool>>,
     ) -> Result<Self, Box<dyn std::error::Error>> {
@@ -34,6 +36,7 @@ impl HtmlState {
             session_store,
             templates: Arc::new(template_engine),
             config,
+            storage,
             reranker_pool,
         })
     }

html-router/src/routes/content/handlers.rs

@@ -190,7 +190,7 @@ pub async fn delete_text_content(
             TextContent::has_other_with_file(&file_info.id, &text_content.id, &state.db).await?;
 
         if !file_in_use {
-            FileInfo::delete_by_id(&file_info.id, &state.db, &state.config).await?;
+            FileInfo::delete_by_id_with_storage(&file_info.id, &state.db, &state.storage).await?;
         }
     }
 

html-router/src/routes/index/handlers.rs

@@ -17,7 +17,6 @@ use crate::{
     utils::text_content_preview::truncate_text_contents,
     AuthSessionType,
 };
-use common::storage::store;
 use common::storage::types::user::DashboardStats;
 use common::{
     error::AppError,
@@ -86,7 +85,7 @@ pub async fn delete_text_content(
             TextContent::has_other_with_file(&file_info.id, &text_content.id, &state.db).await?;
 
         if !file_in_use {
-            FileInfo::delete_by_id(&file_info.id, &state.db, &state.config).await?;
+            FileInfo::delete_by_id_with_storage(&file_info.id, &state.db, &state.storage).await?;
         }
     }
 
@@ -278,7 +277,7 @@ pub async fn serve_file(
         return Ok(TemplateResponse::unauthorized().into_response());
     }
 
-    let stream = match store::get_stream_at(&file_info.path, &state.config).await {
+    let stream = match state.storage.get_stream(&file_info.path).await {
         Ok(s) => s,
         Err(_) => return Ok(TemplateResponse::server_error().into_response()),
     };

html-router/src/routes/ingestion/handlers.rs

@@ -98,7 +98,8 @@ pub async fn process_ingress_form(
     info!("{:?}", input);
 
     let file_infos = try_join_all(input.files.into_iter().map(|file| {
-        FileInfo::new(file, &state.db, &user.id, &state.config).map_err(AppError::from)
+        FileInfo::new_with_storage(file, &state.db, &user.id, &state.storage)
+            .map_err(AppError::from)
     }))
     .await?;