File System Abstraction

application/agents/llm_handler.py

@@ -15,95 +15,86 @@
     @abstractmethod
     def handle_response(self, agent, resp, tools_dict, messages, attachments=None, **kwargs):
         pass
-    
+
     def prepare_messages_with_attachments(self, agent, messages, attachments=None):
         """
         Prepare messages with attachment content if available.
-        
+
         Args:
             agent: The current agent instance.
             messages (list): List of message dictionaries.
             attachments (list): List of attachment dictionaries with content.
-            
+
         Returns:
             list: Messages with attachment context added to the system prompt.
         """
         if not attachments:
             return messages
-        
+
         logger.info(f"Preparing messages with {len(attachments)} attachments")
-        
+
         supported_types = agent.llm.get_supported_attachment_types()
-        
+
         supported_attachments = []
         unsupported_attachments = []
-        
+
         for attachment in attachments:
             mime_type = attachment.get('mime_type')
-            if not mime_type:
-                import mimetypes
-                file_path = attachment.get('path')
-                if file_path:
-                    mime_type = mimetypes.guess_type(file_path)[0] or 'application/octet-stream'
-                else:
-                    unsupported_attachments.append(attachment)
-                    continue
-
             if mime_type in supported_types:
                 supported_attachments.append(attachment)
             else:
                 unsupported_attachments.append(attachment)
-        
+
         # Process supported attachments with the LLM's custom method
         prepared_messages = messages
         if supported_attachments:
             logger.info(f"Processing {len(supported_attachments)} supported attachments with {agent.llm.__class__.__name__}'s method")
             prepared_messages = agent.llm.prepare_messages_with_attachments(messages, supported_attachments)
-        
+
         # Process unsupported attachments with the default method
         if unsupported_attachments:
             logger.info(f"Processing {len(unsupported_attachments)} unsupported attachments with default method")
             prepared_messages = self._append_attachment_content_to_system(prepared_messages, unsupported_attachments)
-            
+
         return prepared_messages
-    
+
     def _append_attachment_content_to_system(self, messages, attachments):
         """
         Default method to append attachment content to the system prompt.
-        
+
         Args:
             messages (list): List of message dictionaries.
             attachments (list): List of attachment dictionaries with content.
-            
+
         Returns:
             list: Messages with attachment context added to the system prompt.
         """
         prepared_messages = messages.copy()
-        
+
         attachment_texts = []
         for attachment in attachments:
             logger.info(f"Adding attachment {attachment.get('id')} to context")
             if 'content' in attachment:
                 attachment_texts.append(f"Attached file content:\n\n{attachment['content']}")
-        
+
         if attachment_texts:
             combined_attachment_text = "\n\n".join(attachment_texts)
-            
+
             system_found = False
             for i in range(len(prepared_messages)):
                 if prepared_messages[i].get("role") == "system":
                     prepared_messages[i]["content"] += f"\n\n{combined_attachment_text}"
                     system_found = True
                     break
-            
+
             if not system_found:
                 prepared_messages.insert(0, {"role": "system", "content": combined_attachment_text})
-        
+
         return prepared_messages
 
 class OpenAILLMHandler(LLMHandler):
     def handle_response(self, agent, resp, tools_dict, messages, attachments=None, stream: bool = True):
-        
+
         messages = self.prepare_messages_with_attachments(agent, messages, attachments)
         logger.info(f"Messages with attachments: {messages}")
         if not stream:
@@ -167,7 +158,7 @@
                     if isinstance(chunk, str) and len(chunk) > 0:
                         yield chunk
                         continue
-                    elif hasattr(chunk, "delta"): 
+                    elif hasattr(chunk, "delta"):
                         chunk_delta = chunk.delta
 
                         if (
@@ -258,7 +249,7 @@
                             return resp
                     elif isinstance(chunk, str) and len(chunk) == 0:
                             continue
-                
+
                 logger.info(f"Regenerating with messages: {messages}")
                 resp = agent.llm.gen_stream(
                     model=agent.gpt_model, messages=messages, tools=agent.tools
@@ -269,9 +260,9 @@
 class GoogleLLMHandler(LLMHandler):
     def handle_response(self, agent, resp, tools_dict, messages, attachments=None, stream: bool = True):
         from google.genai import types
-        
+
         messages = self.prepare_messages_with_attachments(agent, messages, attachments)
-        
+
         while True:
             if not stream:
                 response = agent.llm.gen(

application/api/internal/routes.py

@@ -3,10 +3,13 @@
 from flask import Blueprint, request, send_from_directory
 from werkzeug.utils import secure_filename
 from bson.objectid import ObjectId
-
+import logging
 from application.core.mongo_db import MongoDB
 from application.core.settings import settings
+from application.storage.storage_creator import StorageCreator
+
 
+logger = logging.getLogger(__name__)
 mongo = MongoDB.get_client()
 db = mongo["docsgpt"]
 conversations_collection = db["conversations"]
@@ -45,26 +48,26 @@
     remote_data = request.form["remote_data"] if "remote_data" in request.form else None
     sync_frequency = secure_filename(request.form["sync_frequency"]) if "sync_frequency" in request.form else None
 
-    save_dir = os.path.join(current_dir, "indexes", str(id))
+    storage = StorageCreator.get_storage()
+    index_base_path = f"indexes/{id}"
+
     if settings.VECTOR_STORE == "faiss":
         if "file_faiss" not in request.files:
-            print("No file part")
+            logger.error("No file_faiss part")
             return {"status": "no file"}
         file_faiss = request.files["file_faiss"]
         if file_faiss.filename == "":
             return {"status": "no file name"}
         if "file_pkl" not in request.files:
-            print("No file part")
+            logger.error("No file_pkl part")
             return {"status": "no file"}
         file_pkl = request.files["file_pkl"]
         if file_pkl.filename == "":
             return {"status": "no file name"}
-        # saves index files
-
-        if not os.path.exists(save_dir):
-            os.makedirs(save_dir)
-        file_faiss.save(os.path.join(save_dir, "index.faiss"))
-        file_pkl.save(os.path.join(save_dir, "index.pkl"))
+
+        # Save index files to storage
+        storage.save_file(file_faiss, f"{index_base_path}/index.faiss")
+        storage.save_file(file_pkl, f"{index_base_path}/index.pkl")
 
     existing_entry = sources_collection.find_one({"_id": ObjectId(id)})
     if existing_entry: