Upload 2 files

func.py

@@ -1,13 +1,6 @@
-from io import BytesIO
-import base64
-from PIL import Image
 from flask import jsonify
 import logging
-import json
-import re
 import os
-import requests
-import google.generativeai as genai
 logger = logging.getLogger(__name__)
 
 
@@ -34,12 +27,14 @@ def authenticate_request(request):
 
     return True, None, None
 
+from flask import jsonify
+
 def process_messages_for_gemini(messages):
     gemini_history = []
     errors = []
     system_instruction_text = ""
     is_system_phase = True
-    for message in messages:
+    for i, message in enumerate(messages):
         role = message.get('role')
         content = message.get('content')
 
@@ -52,23 +47,27 @@ def process_messages_for_gemini(messages):
             else:
                 is_system_phase = False
 
-                if role == 'user':
-                    gemini_history.append({"role": "user", "parts": [{"text": content}]})
-                elif role == 'system':
-                    gemini_history.append({"role": "user", "parts": [{"text": content}]})
+                if role in ['user', 'system']:
+                    role_to_use = 'user'
                 elif role == 'assistant':
-                    gemini_history.append({"role": "model", "parts": [{"text": content}]})
+                    role_to_use = 'model'
                 else:
                     errors.append(f"Invalid role: {role}")
+                    continue
+
+                if gemini_history and gemini_history[-1]['role'] == role_to_use:
+                    gemini_history[-1]['parts'].append({"text": content})
+                else:
+                    gemini_history.append({"role": role_to_use, "parts": [{"text": content}]})
+
         elif isinstance(content, list):
             parts = []
             for item in content:
                 if item.get('type') == 'text':
-                    parts.append({"text": item.get('text')})  
+                    parts.append({"text": item.get('text')})
                 elif item.get('type') == 'image_url':
                     image_data = item.get('image_url', {}).get('url', '')
                     if image_data.startswith('data:image/'):
-
                         try:
                             mime_type, base64_data = image_data.split(';')[0].split(':')[1], image_data.split(',')[1]
                             parts.append({
@@ -84,7 +83,6 @@ def process_messages_for_gemini(messages):
                 elif item.get('type') == 'file_url':
                     file_data = item.get('file_url', {}).get('url', '')
                     if file_data.startswith('data:'):
-
                         try:
                             mime_type, base64_data = file_data.split(';')[0].split(':')[1], file_data.split(',')[1]
                             parts.append({
@@ -98,13 +96,18 @@ def process_messages_for_gemini(messages):
                     else:
                         errors.append(f"Invalid file URL format for item: {item}")
 
-            if parts: 
+            if parts:
                 if role in ['user', 'system']:
-                    gemini_history.append({"role": "user", "parts": parts})
-                elif role in ['assistant']:
-                    gemini_history.append({"role": "model", "parts": parts})
+                    role_to_use = 'user'
+                elif role == 'assistant':
+                    role_to_use = 'model'
                 else:
                     errors.append(f"Invalid role: {role}")
+                    continue
+                if gemini_history and gemini_history[-1]['role'] == role_to_use:
+                    gemini_history[-1]['parts'].extend(parts) 
+                else:
+                    gemini_history.append({"role": role_to_use, "parts": parts})
 
     if errors:
         return gemini_history, {"parts": [{"text": system_instruction_text}]}, (jsonify({'error': errors}), 400)