Upload func.py

func.py

@@ -1,8 +1,13 @@
 from flask import jsonify
 import logging
 import os
-logger = logging.getLogger(__name__)
 
+formatter = logging.Formatter('%(message)s')
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+handler = logging.StreamHandler()
+handler.setFormatter(formatter)
+logger.addHandler(handler)
 
 request_counts = {}
 
@@ -32,18 +37,25 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
     errors = []
     system_instruction_text = ""
     is_system_phase = use_system_prompt
+    logger.info(f"Starting message processing. use_system_prompt: {use_system_prompt}")
+
     for i, message in enumerate(messages):
+        logger.info(f"Processing message {i}: {message}")
         role = message.get('role')
         content = message.get('content')
 
         if isinstance(content, str):
+            logger.info(f"Message content is string.")
             if is_system_phase and role == 'system':
+                logger.info(f"System phase and system role detected.")
                 if system_instruction_text:
                     system_instruction_text += "\n" + content
                 else:
                     system_instruction_text = content
+                logger.info(f"Current system_instruction_text: {system_instruction_text}")
             else:
                 is_system_phase = False
+                logger.info(f"System phase ended.")
 
                 if role in ['user', 'system']:
                     role_to_use = 'user'
@@ -51,20 +63,27 @@ 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})
+                    logger.info(f"Appended text to existing role '{role_to_use}'.")
                 else:
                     gemini_history.append({"role": role_to_use, "parts": [{"text": content}]})
+                    logger.info(f"Created new entry for role '{role_to_use}' with text.")
 
         elif isinstance(content, list):
+            logger.info(f"Message content is list (likely includes media).")
             parts = []
             for item in content:
+                logger.info(f"Processing content item: {item}")
                 if item.get('type') == 'text':
                     parts.append({"text": item.get('text')})
+                    logger.info(f"Added text part: {item.get('text')}")
                 elif item.get('type') == 'image_url':
                     image_data = item.get('image_url', {}).get('url', '')
+                    logger.info(f"Processing image_url: {image_data}")
                     if image_data.startswith('data:image/'):
                         try:
                             mime_type, base64_data = image_data.split(';')[0].split(':')[1], image_data.split(',')[1]
@@ -74,12 +93,18 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
                                     "data": base64_data
                                 }
                             })
-                        except (IndexError, ValueError):
-                            errors.append(f"Invalid data URI for image: {image_data}")
+                            logger.info(f"Added inline image data with mime_type: {mime_type}")
+                        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)
                     else:
-                        errors.append(f"Invalid image URL format for item: {item}")
+                        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)
                 elif item.get('type') == 'file_url':
                     file_data = item.get('file_url', {}).get('url', '')
+                    logger.info(f"Processing file_url: {file_data}")
                     if file_data.startswith('data:'):
                         try:
                             mime_type, base64_data = file_data.split(';')[0].split(':')[1], file_data.split(',')[1]
@@ -89,10 +114,15 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
                                     "data": base64_data
                                 }
                             })
-                        except (IndexError, ValueError):
-                            errors.append(f"Invalid data URI for file: {file_data}")
+                            logger.info(f"Added inline file data with mime_type: {mime_type}")
+                        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)
                     else:
-                        errors.append(f"Invalid file URL format for item: {item}")
+                        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)
 
             if parts:
                 if role in ['user', 'system']:
@@ -101,13 +131,18 @@ 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)
+                    logger.info(f"Extended parts to existing role '{role_to_use}'.")
                 else:
                     gemini_history.append({"role": role_to_use, "parts": parts})
+                    logger.info(f"Created new entry for role '{role_to_use}' with 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:
+        logger.info(f"Message processing successful. Returning gemini_history and system_instruction_text.")
         return gemini_history, {"parts": [{"text": system_instruction_text}]}, None