|
@@ -458,7 +458,7 @@ class DialogueManager:
|
|
recent_messages = dialogue[-max_message_to_use:]
|
|
recent_messages = dialogue[-max_message_to_use:]
|
|
ret = False
|
|
ret = False
|
|
for entry in recent_messages:
|
|
for entry in recent_messages:
|
|
- if entry.get('type') in (MessageType.IMAGE_GW, MessageType.IMAGE_QW):
|
|
|
|
|
|
+ if entry.get('type') in (MessageType.IMAGE_GW, MessageType.IMAGE_QW, MessageType.GIF):
|
|
ret = True
|
|
ret = True
|
|
break
|
|
break
|
|
return ret
|
|
return ret
|
|
@@ -475,7 +475,7 @@ class DialogueManager:
|
|
role = entry['role']
|
|
role = entry['role']
|
|
msg_type = entry.get('type', MessageType.TEXT)
|
|
msg_type = entry.get('type', MessageType.TEXT)
|
|
fmt_time = DialogueManager.format_timestamp(entry['timestamp'])
|
|
fmt_time = DialogueManager.format_timestamp(entry['timestamp'])
|
|
- if msg_type in (MessageType.IMAGE_GW, MessageType.IMAGE_QW):
|
|
|
|
|
|
+ if msg_type in (MessageType.IMAGE_GW, MessageType.IMAGE_QW, MessageType.GIF):
|
|
if multimodal:
|
|
if multimodal:
|
|
messages.append({
|
|
messages.append({
|
|
"role": role,
|
|
"role": role,
|
|
@@ -542,7 +542,7 @@ class DialogueManager:
|
|
objects_to_aggr = []
|
|
objects_to_aggr = []
|
|
messages_to_aggr = []
|
|
messages_to_aggr = []
|
|
last_message_role = role
|
|
last_message_role = role
|
|
- if entry.get('type', MessageType.TEXT) in (MessageType.IMAGE_GW, MessageType.IMAGE_QW):
|
|
|
|
|
|
+ if entry.get('type', MessageType.TEXT) in (MessageType.IMAGE_GW, MessageType.IMAGE_QW, MessageType.GIF):
|
|
# 多模态消息必须用特殊的聚合方式,一个object_string数组中只能有一个文字消息,但可以有多个图片
|
|
# 多模态消息必须用特殊的聚合方式,一个object_string数组中只能有一个文字消息,但可以有多个图片
|
|
if role == 'user':
|
|
if role == 'user':
|
|
objects_to_aggr.append(entry)
|
|
objects_to_aggr.append(entry)
|