Upload 4 files

func.py

@@ -70,60 +70,74 @@ def get_gen_model(api_key, model, temperature, max_tokens):
     return gen_model
 
 def process_messages_for_gemini(messages):
-
     gemini_history = []
+    errors = []
     for message in messages:
         role = message.get('role')
         content = message.get('content')
 
-        if isinstance(content, str):  
+        if isinstance(content, str):
             if role == 'system':
                 gemini_history.append({"role": "user", "parts": [content]})
             elif role == 'user':
                 gemini_history.append({"role": "user", "parts": [content]})
             elif role == 'assistant':
                 gemini_history.append({"role": "model", "parts": [content]})
-        elif isinstance(content, list): 
+            else:
+                errors.append(f"Invalid role: {role}")
+        elif isinstance(content, list):
             parts = []
             for item in content:
                 if item.get('type') == 'text':
-                    parts.append(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:
-                            image_type = image_data.split(';')[0].split('/')[1].upper()  
-                            base64_image = image_data.split(';base64,')[1]
 
-                            image = Image.open(BytesIO(base64.b64decode(base64_image)))
-
-                            if image.mode != 'RGB':
-                                image = image.convert('RGB')
-
-                            if image.width > 2048 or image.height > 2048:
-                                image.thumbnail((2048, 2048))
+                        try:
+                            mime_type, base64_data = image_data.split(';')[0].split(':')[1], image_data.split(',')[1]
+                            parts.append({
+                                "inline_data": {
+                                    "mime_type": mime_type,
+                                    "data": base64_data
+                                }
+                            })
+                        except (IndexError, ValueError):
+                            errors.append(f"Invalid data URI for image: {image_data}")
+                    else:
+                        errors.append(f"Invalid image URL format for item: {item}")
+                elif item.get('type') == 'file_url':
+                    file_data = item.get('file_url', {}).get('url', '')
+                    if file_data.startswith('data:'):
 
-                            output_buffer = BytesIO()
-                            image.save(output_buffer, format=image_type)  
-                            output_buffer.seek(0)
-                            parts.append(image)
-                        except Exception as e:
-                            logger.error(f"Error processing image: {e}")
-                            return [], None, (jsonify({'error': 'Invalid image data'}), 400)
+                        try:
+                            mime_type, base64_data = file_data.split(';')[0].split(':')[1], file_data.split(',')[1]
+                            parts.append({
+                                "inline_data": {
+                                    "mime_type": mime_type,
+                                    "data": base64_data
+                                }
+                            })
+                        except (IndexError, ValueError):
+                            errors.append(f"Invalid data URI for file: {file_data}")
                     else:
-                        return [], None, (jsonify({'error': 'Invalid image URL format'}), 400)
+                        errors.append(f"Invalid file URL format for item: {item}")
 
-            if role in ['user', 'system']:
-                gemini_history.append({"role": "user", "parts": parts})
-            elif role == 'assistant':
-                gemini_history.append({"role": "model", "parts": parts})
-            else:
-                return [], None, (jsonify({'error': f'Invalid role: {role}'}), 400)
+            if parts: 
+                if role in ['user', 'system']:
+                    gemini_history.append({"role": "user", "parts": parts})
+                elif role == 'assistant':
+                    gemini_history.append({"role": "model", "parts": parts})
+                else:
+                    errors.append(f"Invalid role: {role}")
 
     if gemini_history:
         user_message = gemini_history[-1]
-        gemini_history = gemini_history[:-1]  
+        gemini_history = gemini_history[:-1]
     else:
         user_message = {"role": "user", "parts": [""]}
 
-    return gemini_history, user_message, None
+    if errors:
+        return gemini_history, user_message, (jsonify({'error': errors}), 400)
+    else:
+        return gemini_history, user_message, None