Upload 2 files

app.py

@@ -170,40 +170,7 @@ def process_chat_with_files(chat_history, system_instruction, api_key):
     Returns:
         Response: Server-sent events response with chat messages
     """
-    try:
-        # Configure Gemini
-        
-        # Initialize model
-        generation_config = {
-            "temperature": 1,
-            "top_p": 0.95,
-            "top_k": 40,
-            "max_output_tokens": 8192,
-            "response_mime_type": "text/plain",
-        }
-        
-        model = genai.GenerativeModel(
-            model_name="gemini-1.5-pro-002",
-            generation_config=generation_config,
-            system_instruction=system_instruction,
-        )
-        
-        # Process files if any
-        
-        # Create chat session
-        chat_session = model.start_chat()
-        
-        def generate():
-            response = chat_session.send_message(chat_history, stream=True)
-            for chunk in response:
-                if chunk.text:
-                    yield f"data: {chunk.text}\n\n"
-        
-        return Response(generate(), mimetype='text/event-stream')
     
-    except Exception as e:
-        logger.error(f"Error in process_chat_with_files: {str(e)}")
-        return jsonify({'error': str(e)}), 500
 
 @app.route('/presets', methods=['GET'])
 def get_presets():
@@ -290,11 +257,10 @@ def chat():
     if not data or 'message' not in data or 'preset' not in data:
         return jsonify({'status': 'error', 'error': 'Invalid request data'}), 400
     
-    message = data['message']
+    userMessage = data['userMessage']
     preset_id = data['preset']
     session_id = get_or_create_session_id()
     chat_history = load_chat_history(session_id)
-    files = data.get('files', [])
     system_instruction = ""
     preset_name = None
     
@@ -316,18 +282,53 @@ def chat():
             default_preset = next(p for p in PREDEFINED_PRESETS if p['id'] == 'default')
             system_message = default_preset['content']
             preset_name = default_preset['name']
-    
-    key = key_manager.get_available_key()
-    if not key:
-        yield "No available API keys."
-        return
+    def generate():
+        key = key_manager.get_available_key()
+        if not key:
+            yield "No available API keys."
+            return
+                
+        debug.log_prompt(chat_history, preset_name)
             
-    debug.log_prompt(chat_history, preset_name)
+        messages = chat_history + userMessage
         
-    messages = chat_history + {"role": "user", "parts": [message]}
+        generation_config = {
+                "temperature": 1,
+                "top_p": 0.95,
+                "top_k": 40,
+                "max_output_tokens": 8192,
+                "response_mime_type": "text/plain",
+            }
+            
+        model = genai.GenerativeModel(
+            model_name="gemini-1.5-pro-002",
+            generation_config=generation_config,
+            system_instruction=system_instruction,
+        )
         
-    return process_chat_with_files(messages, files, system_instruction, key)
+        try:
+            
+            model_message = {"role": "model", "parts": [""]}
+            # Create chat session
+            chat_session = model.start_chat()
+            
+            
+            response = chat_session.send_message(messages, stream=True)
+            for chunk in response:
+                if chunk.text:
+                    model_message['parts'][0] += chunk.text
+                    yield f"data: {chunk.text}\n\n"
+                        
+            chat_history.append(model_message)
+            
+            session_id = get_or_create_session_id()
+            save_chat_history(session_id, chat_history)
+    
+        except Exception as e:
+            logger.error(f"Error in process_chat_with_files: {str(e)}")
+            return jsonify({'error': str(e)}), 500
         
+    return Response(generate(), mimetype='text/event-stream')
 
 @app.route('/history', methods=['GET'])
 def get_history():

templates/index.html

@@ -288,7 +288,7 @@
                 const response = await fetch('/chat', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ history, preset: selectedPreset })
+                    body: JSON.stringify({ userMessage: Message, preset: selectedPreset })
                 });
 
                 const reader = response.body.getReader();