refac
This commit is contained in:
1 parent
d06e6d6ddc
commit
4d766a3edf
2 files changed
+31
-13
No files matched your search
@@ -366,20 +366,20 @@ class ChatTable:
|
|||||||
await db.commit()
|
await db.commit()
|
||||||
|
|
||||||
# Dual-write messages to chat_message table
|
# Dual-write messages to chat_message table
|
||||||
try:
|
for form_data, chat_obj in zip(chat_import_forms, chats):
|
||||||
for form_data, chat_obj in zip(chat_import_forms, chats):
|
history = form_data.chat.get('history', {})
|
||||||
history = form_data.chat.get('history', {})
|
messages = history.get('messages', {})
|
||||||
messages = history.get('messages', {})
|
for message_id, message in messages.items():
|
||||||
for message_id, message in messages.items():
|
if isinstance(message, dict) and message.get('role'):
|
||||||
if isinstance(message, dict) and message.get('role'):
|
try:
|
||||||
await ChatMessages.upsert_message(
|
await ChatMessages.upsert_message(
|
||||||
message_id=message_id,
|
message_id=message_id,
|
||||||
chat_id=chat_obj.id,
|
chat_id=chat_obj.id,
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
data=message,
|
data=message,
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.warning(f'Failed to write imported messages to chat_message table: {e}')
|
log.warning(f'Failed to write imported message {message_id} for chat {chat_obj.id}: {e}')
|
||||||
|
|
||||||
return [ChatModel.model_validate(chat) for chat in chats]
|
return [ChatModel.model_validate(chat) for chat in chats]
|
||||||
|
|
||||||
|
|||||||
+23
-5
@@ -729,6 +729,7 @@ const convertOpenAIMessages = (convo) => {
|
|||||||
const messages = [];
|
const messages = [];
|
||||||
let currentId = '';
|
let currentId = '';
|
||||||
let lastId = null;
|
let lastId = null;
|
||||||
|
const uniqueModels = new Set<string>();
|
||||||
|
|
||||||
for (const message_id in mapping) {
|
for (const message_id in mapping) {
|
||||||
const message = mapping[message_id];
|
const message = mapping[message_id];
|
||||||
@@ -749,16 +750,28 @@ const convertOpenAIMessages = (convo) => {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const new_chat = {
|
const model =
|
||||||
|
message['message']?.['metadata']?.['model_slug'] || 'gpt-3.5-turbo';
|
||||||
|
const timestamp = message['message']?.['create_time']
|
||||||
|
? Math.floor(message['message']['create_time'])
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
const new_chat: Record<string, any> = {
|
||||||
id: message_id,
|
id: message_id,
|
||||||
parentId: lastId,
|
parentId: lastId,
|
||||||
childrenIds: message['children'] || [],
|
childrenIds: message['children'] || [],
|
||||||
role: role !== 'user' ? 'assistant' : 'user',
|
role: role !== 'user' ? 'assistant' : 'user',
|
||||||
content: extractOpenAIMessageContent(message['message']),
|
content: extractOpenAIMessageContent(message['message']),
|
||||||
model: 'gpt-3.5-turbo',
|
model,
|
||||||
done: true,
|
done: true,
|
||||||
context: null
|
context: null,
|
||||||
|
...(timestamp !== undefined && { timestamp })
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (role !== 'user') {
|
||||||
|
uniqueModels.add(model);
|
||||||
|
}
|
||||||
|
|
||||||
messages.push(new_chat);
|
messages.push(new_chat);
|
||||||
lastId = currentId;
|
lastId = currentId;
|
||||||
}
|
}
|
||||||
@@ -781,7 +794,7 @@ const convertOpenAIMessages = (convo) => {
|
|||||||
currentId: currentId,
|
currentId: currentId,
|
||||||
messages: history // Need to convert this to not a list and instead a json object
|
messages: history // Need to convert this to not a list and instead a json object
|
||||||
},
|
},
|
||||||
models: ['gpt-3.5-turbo'],
|
models: uniqueModels.size > 0 ? [...uniqueModels] : ['gpt-3.5-turbo'],
|
||||||
messages: messages,
|
messages: messages,
|
||||||
options: {},
|
options: {},
|
||||||
timestamp: convo['create_time'],
|
timestamp: convo['create_time'],
|
||||||
@@ -828,12 +841,17 @@ export const convertOpenAIChats = (_chats) => {
|
|||||||
const chat = convertOpenAIMessages(convo);
|
const chat = convertOpenAIMessages(convo);
|
||||||
|
|
||||||
if (validateChat(chat)) {
|
if (validateChat(chat)) {
|
||||||
|
// Use created_at/updated_at keys so importChatsHandler passes them
|
||||||
|
// to the backend correctly (previously used 'timestamp' which was ignored)
|
||||||
|
const createdAt = convo['create_time'] ? Math.floor(convo['create_time']) : null;
|
||||||
|
const updatedAt = convo['update_time'] ? Math.floor(convo['update_time']) : createdAt;
|
||||||
chats.push({
|
chats.push({
|
||||||
id: convo['id'],
|
id: convo['id'],
|
||||||
user_id: '',
|
user_id: '',
|
||||||
title: convo['title'],
|
title: convo['title'],
|
||||||
chat: chat,
|
chat: chat,
|
||||||
timestamp: convo['create_time']
|
created_at: createdAt,
|
||||||
|
updated_at: updatedAt
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
failed++;
|
failed++;
|
||||||
|
|||||||
Reference in new issue
Block a user