Moonfanz commited on
Commit
6b9de43
·
verified ·
1 Parent(s): fccf15f

Upload func.py

Browse files
Files changed (1) hide show
  1. func.py +18 -18
func.py CHANGED
@@ -37,25 +37,25 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
37
  errors = []
38
  system_instruction_text = ""
39
  is_system_phase = use_system_prompt
40
- logger.info(f"Starting message processing. use_system_prompt: {use_system_prompt}")
41
 
42
  for i, message in enumerate(messages):
43
- logger.info(f"Processing message {i}: {message}")
44
  role = message.get('role')
45
  content = message.get('content')
46
 
47
  if isinstance(content, str):
48
- logger.info(f"Message content is string.")
49
  if is_system_phase and role == 'system':
50
- logger.info(f"System phase and system role detected.")
51
  if system_instruction_text:
52
  system_instruction_text += "\n" + content
53
  else:
54
  system_instruction_text = content
55
- logger.info(f"Current system_instruction_text: {system_instruction_text}")
56
  else:
57
  is_system_phase = False
58
- logger.info(f"System phase ended.")
59
 
60
  if role in ['user', 'system']:
61
  role_to_use = 'user'
@@ -68,22 +68,22 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
68
 
69
  if gemini_history and gemini_history[-1]['role'] == role_to_use:
70
  gemini_history[-1]['parts'].append({"text": content})
71
- logger.info(f"Appended text to existing role '{role_to_use}'.")
72
  else:
73
  gemini_history.append({"role": role_to_use, "parts": [{"text": content}]})
74
- logger.info(f"Created new entry for role '{role_to_use}' with text.")
75
 
76
  elif isinstance(content, list):
77
- logger.info(f"Message content is list (likely includes media).")
78
  parts = []
79
  for item in content:
80
- logger.info(f"Processing content item: {item}")
81
  if item.get('type') == 'text':
82
  parts.append({"text": item.get('text')})
83
- logger.info(f"Added text part: {item.get('text')}")
84
  elif item.get('type') == 'image_url':
85
  image_data = item.get('image_url', {}).get('url', '')
86
- logger.info(f"Processing image_url: {image_data}")
87
  if image_data.startswith('data:image/'):
88
  try:
89
  mime_type, base64_data = image_data.split(';')[0].split(':')[1], image_data.split(',')[1]
@@ -93,7 +93,7 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
93
  "data": base64_data
94
  }
95
  })
96
- logger.info(f"Added inline image data with mime_type: {mime_type}")
97
  except (IndexError, ValueError) as e:
98
  error_message = f"Invalid data URI for image: {image_data}. Error: {e}"
99
  errors.append(error_message)
@@ -104,7 +104,7 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
104
  logger.error(error_message)
105
  elif item.get('type') == 'file_url':
106
  file_data = item.get('file_url', {}).get('url', '')
107
- logger.info(f"Processing file_url: {file_data}")
108
  if file_data.startswith('data:'):
109
  try:
110
  mime_type, base64_data = file_data.split(';')[0].split(':')[1], file_data.split(',')[1]
@@ -114,7 +114,7 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
114
  "data": base64_data
115
  }
116
  })
117
- logger.info(f"Added inline file data with mime_type: {mime_type}")
118
  except (IndexError, ValueError) as e:
119
  error_message = f"Invalid data URI for file: {file_data}. Error: {e}"
120
  errors.append(error_message)
@@ -135,14 +135,14 @@ def process_messages_for_gemini(messages, use_system_prompt=False):
135
  continue
136
  if gemini_history and gemini_history[-1]['role'] == role_to_use:
137
  gemini_history[-1]['parts'].extend(parts)
138
- logger.info(f"Extended parts to existing role '{role_to_use}'.")
139
  else:
140
  gemini_history.append({"role": role_to_use, "parts": parts})
141
- logger.info(f"Created new entry for role '{role_to_use}' with parts.")
142
 
143
  if errors:
144
  logger.warning(f"Errors encountered during message processing: {errors}")
145
  return gemini_history, {"parts": [{"text": system_instruction_text}]}, (jsonify({'error': errors}), 400)
146
  else:
147
- logger.info(f"Message processing successful. Returning gemini_history and system_instruction_text.")
148
  return gemini_history, {"parts": [{"text": system_instruction_text}]}, None
 
37
  errors = []
38
  system_instruction_text = ""
39
  is_system_phase = use_system_prompt
40
+ #logger.info(f"Starting message processing. use_system_prompt: {use_system_prompt}")
41
 
42
  for i, message in enumerate(messages):
43
+ ##logger.info(f"Processing message {i}: {message}")
44
  role = message.get('role')
45
  content = message.get('content')
46
 
47
  if isinstance(content, str):
48
+ #logger.info(f"Message content is string.")
49
  if is_system_phase and role == 'system':
50
+ #logger.info(f"System phase and system role detected.")
51
  if system_instruction_text:
52
  system_instruction_text += "\n" + content
53
  else:
54
  system_instruction_text = content
55
+ #logger.info(f"Current system_instruction_text: {system_instruction_text}")
56
  else:
57
  is_system_phase = False
58
+ #logger.info(f"System phase ended.")
59
 
60
  if role in ['user', 'system']:
61
  role_to_use = 'user'
 
68
 
69
  if gemini_history and gemini_history[-1]['role'] == role_to_use:
70
  gemini_history[-1]['parts'].append({"text": content})
71
+ #logger.info(f"Appended text to existing role '{role_to_use}'.")
72
  else:
73
  gemini_history.append({"role": role_to_use, "parts": [{"text": content}]})
74
+ #logger.info(f"Created new entry for role '{role_to_use}' with text.")
75
 
76
  elif isinstance(content, list):
77
+ #logger.info(f"Message content is list (likely includes media).")
78
  parts = []
79
  for item in content:
80
+ #logger.info(f"Processing content item: {item}")
81
  if item.get('type') == 'text':
82
  parts.append({"text": item.get('text')})
83
+ #logger.info(f"Added text part: {item.get('text')}")
84
  elif item.get('type') == 'image_url':
85
  image_data = item.get('image_url', {}).get('url', '')
86
+ #logger.info(f"Processing image_url: {image_data}")
87
  if image_data.startswith('data:image/'):
88
  try:
89
  mime_type, base64_data = image_data.split(';')[0].split(':')[1], image_data.split(',')[1]
 
93
  "data": base64_data
94
  }
95
  })
96
+ #logger.info(f"Added inline image data with mime_type: {mime_type}")
97
  except (IndexError, ValueError) as e:
98
  error_message = f"Invalid data URI for image: {image_data}. Error: {e}"
99
  errors.append(error_message)
 
104
  logger.error(error_message)
105
  elif item.get('type') == 'file_url':
106
  file_data = item.get('file_url', {}).get('url', '')
107
+ #logger.info(f"Processing file_url: {file_data}")
108
  if file_data.startswith('data:'):
109
  try:
110
  mime_type, base64_data = file_data.split(';')[0].split(':')[1], file_data.split(',')[1]
 
114
  "data": base64_data
115
  }
116
  })
117
+ #logger.info(f"Added inline file data with mime_type: {mime_type}")
118
  except (IndexError, ValueError) as e:
119
  error_message = f"Invalid data URI for file: {file_data}. Error: {e}"
120
  errors.append(error_message)
 
135
  continue
136
  if gemini_history and gemini_history[-1]['role'] == role_to_use:
137
  gemini_history[-1]['parts'].extend(parts)
138
+ #logger.info(f"Extended parts to existing role '{role_to_use}'.")
139
  else:
140
  gemini_history.append({"role": role_to_use, "parts": parts})
141
+ #logger.info(f"Created new entry for role '{role_to_use}' with parts.")
142
 
143
  if errors:
144
  logger.warning(f"Errors encountered during message processing: {errors}")
145
  return gemini_history, {"parts": [{"text": system_instruction_text}]}, (jsonify({'error': errors}), 400)
146
  else:
147
+ #logger.info(f"Message processing successful. Returning gemini_history and system_instruction_text.")
148
  return gemini_history, {"parts": [{"text": system_instruction_text}]}, None