@@ -193,41 +193,41 @@ def convert_to_openai_messages(
193
193
194
194
new_messages .append (new_message )
195
195
196
- combined_messages = []
197
- current_role = None
198
- current_content = []
199
-
200
- for message in new_messages :
201
- if isinstance (message ["content" ], str ):
202
- if current_role is None :
203
- current_role = message ["role" ]
204
- current_content .append (message ["content" ])
205
- elif current_role == message ["role" ]:
206
- current_content .append (message ["content" ])
196
+ if function_calling == False :
197
+ combined_messages = []
198
+ current_role = None
199
+ current_content = []
200
+
201
+ for message in new_messages :
202
+ if isinstance (message ["content" ], str ):
203
+ if current_role is None :
204
+ current_role = message ["role" ]
205
+ current_content .append (message ["content" ])
206
+ elif current_role == message ["role" ]:
207
+ current_content .append (message ["content" ])
208
+ else :
209
+ combined_messages .append ({
210
+ "role" : current_role ,
211
+ "content" : "\n " .join (current_content )
212
+ })
213
+ current_role = message ["role" ]
214
+ current_content = [message ["content" ]]
207
215
else :
208
- combined_messages .append ({
209
- "role" : current_role ,
210
- "content" : "\n " .join (current_content )
211
- })
212
- current_role = message ["role" ]
213
- current_content = [message ["content" ]]
214
- else :
215
- if current_content :
216
- combined_messages .append ({
217
- "role" : current_role ,
218
- "content" : "\n " .join (current_content )
219
- })
220
- current_content = []
221
- combined_messages .append (message )
222
-
223
- # Add the last message
224
- if current_content :
225
- combined_messages .append ({
226
- "role" : current_role ,
227
- "content" : " " .join (current_content )
228
- })
229
-
230
- new_messages = combined_messages
231
-
216
+ if current_content :
217
+ combined_messages .append ({
218
+ "role" : current_role ,
219
+ "content" : "\n " .join (current_content )
220
+ })
221
+ current_content = []
222
+ combined_messages .append (message )
223
+
224
+ # Add the last message
225
+ if current_content :
226
+ combined_messages .append ({
227
+ "role" : current_role ,
228
+ "content" : " " .join (current_content )
229
+ })
230
+
231
+ new_messages = combined_messages
232
232
233
233
return new_messages
0 commit comments