Upload 4 files

func.py

@@ -1,17 +1,11 @@
 from flask import jsonify
 import logging
 import os
-
-formatter = logging.Formatter('%(message)s')
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-logger.addHandler(handler)
 
 request_counts = {}
 
-password = os.environ['password']
+password = os.environ['ProxyPassword']
 
 def authenticate_request(request):
     auth_header = request.headers.get('Authorization')
@@ -37,25 +31,18 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
     errors = []
     system_instruction_text = ""
     is_system_phase = use_system_prompt
-    
-
     for i, message in enumerate(messages):
-        
         role = message.get('role')
         content = message.get('content')
 
         if isinstance(content, str):
-            
             if is_system_phase and role == 'system':
-                
                 if system_instruction_text:
                     system_instruction_text += "\n" + content
                 else:
                     system_instruction_text = content
-                
             else:
                 is_system_phase = False
-                
 
                 if role in ['user', 'system']:
                     role_to_use = 'user'
@@ -63,27 +50,20 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
                     role_to_use = 'model'
                 else:
                     errors.append(f"Invalid role: {role}")
-                    logger.error(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')})
-                    
                 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]
@@ -93,18 +73,12 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
                                     "data": base64_data
                                 }
                             })
-                            
-                        except (IndexError, ValueError) as e:
-                            error_message = f"Invalid data URI for image: {image_data}. Error: {e}"
-                            errors.append(error_message)
-                            logger.error(error_message)
+                        except (IndexError, ValueError):
+                            errors.append(f"Invalid data URI for image: {image_data}")
                     else:
-                        error_message = f"Invalid image URL format for item: {item}. URL should start with 'data:image/' for inline images."
-                        errors.append(error_message)
-                        logger.error(error_message)
+                        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:'):
                         try:
                             mime_type, base64_data = file_data.split(';')[0].split(':')[1], file_data.split(',')[1]
@@ -114,15 +88,10 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
                                     "data": base64_data
                                 }
                             })
-                            
-                        except (IndexError, ValueError) as e:
-                            error_message = f"Invalid data URI for file: {file_data}. Error: {e}"
-                            errors.append(error_message)
-                            logger.error(error_message)
+                        except (IndexError, ValueError):
+                            errors.append(f"Invalid data URI for file: {file_data}")
                     else:
-                        error_message = f"Invalid file URL format for item: {item}. URL should start with 'data:' for inline files."
-                        errors.append(error_message)
-                        logger.error(error_message)
+                        errors.append(f"Invalid file URL format for item: {item}")
 
             if parts:
                 if role in ['user', 'system']:
@@ -131,18 +100,13 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
                     role_to_use = 'model'
                 else:
                     errors.append(f"Invalid role: {role}")
-                    logger.error(f"Invalid role: {role}")
                     continue
                 if gemini_history and gemini_history[-1]['role'] == role_to_use:
-                    gemini_history[-1]['parts'].extend(parts)
-                    
+                    gemini_history[-1]['parts'].extend(parts) 
                 else:
                     gemini_history.append({"role": role_to_use, "parts": parts})
-                    
 
     if errors:
-        logger.warning(f"Errors encountered during message processing: {errors}")
         return gemini_history, {"parts": [{"text": system_instruction_text}]}, (jsonify({'error': errors}), 400)
     else:
-        
         return gemini_history, {"parts": [{"text": system_instruction_text}]}, None

requirements.txt

@@ -1,8 +1,6 @@
-Flask==3.1.0
-Flask-CORS==5.0.0
+Flask==2.0.3
+Flask-CORS==3.0.10
 requests==2.32.3
 Werkzeug==3.1.3
-google==3.0.0
-google-generativeai==0.8.3
 pillow==10.3.0
 APScheduler==3.11.0