From 27d5eb46847f71e0ec15c437c1064b950fca32fe Mon Sep 17 00:00:00 2001 From: Brandon Hulston Date: Wed, 17 Jan 2024 01:01:11 -0700 Subject: [PATCH 1/6] Add chatGPT chat history Import functionality --- src/lib/components/chat/SettingsModal.svelte | 5 +- src/lib/utils/index.ts | 68 ++++++++++++++++++++ src/routes/(app)/c/[id]/+page.svelte | 2 +- 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte index 35ad9f1a..9da70add 100644 --- a/src/lib/components/chat/SettingsModal.svelte +++ b/src/lib/components/chat/SettingsModal.svelte @@ -21,7 +21,7 @@ import { WEB_UI_VERSION, WEBUI_API_BASE_URL } from '$lib/constants'; import { config, models, settings, user, chats } from '$lib/stores'; - import { splitStream, getGravatarURL } from '$lib/utils'; + import { splitStream, getGravatarURL, getImportOrigin, convertGptChats } from '$lib/utils'; import Advanced from './Settings/Advanced.svelte'; import Modal from '../common/Modal.svelte'; @@ -132,6 +132,9 @@ reader.onload = (event) => { let chats = JSON.parse(event.target.result); console.log(chats); + if (getImportOrigin(chats) == 'gpt') { + chats = convertGptChats(chats); + } importChats(chats); }; diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts index 129a1d12..2c0906dc 100644 --- a/src/lib/utils/index.ts +++ b/src/lib/utils/index.ts @@ -192,3 +192,71 @@ export const calculateSHA256 = async (file) => { throw error; } }; + +export const getImportOrigin = (_chats) => { + // Check what external service chat imports are from + if ('mapping' in _chats[0]) { + return 'gpt'; + } + return 'webui'; +} + +const convertGptMessages = (convo) => { + // Parse OpenAI chat messages and create chat dictionary for creating new chats + const mapping = convo["mapping"]; + const messages = []; + let currentId = ""; + + for (let message_id in mapping) { + const message = mapping[message_id]; + currentId = message_id; + if (message["message"] == null || message["message"]["content"]["parts"][0] == "") { + // Skip chat messages with no content + continue; + } else { + const new_chat = { + "id": message_id, + "parentId": messages.length > 0 ? message["parent"] : null, + "childrenIds": message["children"] || [], + "role": message["message"]?.["author"]?.["role"] !== "user" ? "assistant" : "user", + "content": message["message"]?.["content"]?.['parts']?.[0] || "", + "model": '', + "done": true, + "context": null, + } + messages.push(new_chat) + } + } + + let history = {}; + messages.forEach(obj => history[obj.id] = obj); + + const chat = { + "history": { + "currentId": currentId, + "messages": history, // Need to convert this to not a list and instead a json object + }, + "models": [""], + "messages": messages, + "options": {}, + "timestamp": convo["create_time"], + "title": convo["title"], + } + return chat; +} + +export const convertGptChats = (_chats) => { + // Create a list of dictionaries with each conversation from import + const chats = []; + for (let convo of _chats) { + const chat = { + "id": convo["id"], + "user_id": '', + "title": convo["title"], + "chat": convertGptMessages(convo), + "timestamp": convo["timestamp"], + } + chats.push(chat) + } + return chats; +} diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte index c0db9c5f..314cc7b6 100644 --- a/src/routes/(app)/c/[id]/+page.svelte +++ b/src/routes/(app)/c/[id]/+page.svelte @@ -696,7 +696,7 @@
- 0} /> + 0 && !selectedModels.includes('')} />
From 415777eca2f7fafef84aa7922bfc553cbe8acbe7 Mon Sep 17 00:00:00 2001 From: Brandon Hulston Date: Wed, 17 Jan 2024 01:19:27 -0700 Subject: [PATCH 2/6] Add error catching for import --- src/lib/components/chat/SettingsModal.svelte | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte index 9da70add..f5c2b06e 100644 --- a/src/lib/components/chat/SettingsModal.svelte +++ b/src/lib/components/chat/SettingsModal.svelte @@ -133,7 +133,11 @@ let chats = JSON.parse(event.target.result); console.log(chats); if (getImportOrigin(chats) == 'gpt') { - chats = convertGptChats(chats); + try { + chats = convertGptChats(chats); + } catch (error) { + console.log("Unable to import chats:", error); + } } importChats(chats); }; From 81bfb97c91e72a24e74bddc7ec818d98a6f73920 Mon Sep 17 00:00:00 2001 From: Brandon Hulston Date: Wed, 17 Jan 2024 02:07:29 -0700 Subject: [PATCH 3/6] Make sure model is saved in DB for imported chats (or chats with no model saved already) --- src/routes/(app)/c/[id]/+page.svelte | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte index 314cc7b6..593a7a78 100644 --- a/src/routes/(app)/c/[id]/+page.svelte +++ b/src/routes/(app)/c/[id]/+page.svelte @@ -200,8 +200,15 @@ await chatId.set('local'); } await tick(); - } + } else if (chat.chat["models"][0] == "") { + // If model is not saved in DB, then save selectedmodel when message is sent + chat = await updateChatById(localStorage.token, $chatId, { + models: selectedModels + }); + await chats.set(await getChatList(localStorage.token)); + } + // Reset chat input textarea prompt = ''; files = []; From 1f66bbba98633133da7b6db82ad50b18feef51d9 Mon Sep 17 00:00:00 2001 From: Brandon Hulston Date: Wed, 17 Jan 2024 02:24:17 -0700 Subject: [PATCH 4/6] Better solution to handle edge cases --- src/routes/(app)/c/[id]/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte index 593a7a78..c4774aaa 100644 --- a/src/routes/(app)/c/[id]/+page.svelte +++ b/src/routes/(app)/c/[id]/+page.svelte @@ -200,7 +200,7 @@ await chatId.set('local'); } await tick(); - } else if (chat.chat["models"][0] == "") { + } else if (chat.chat["models"] != selectedModels) { // If model is not saved in DB, then save selectedmodel when message is sent chat = await updateChatById(localStorage.token, $chatId, { From f40147ce58e746eb2825e6755cdf9a734a0b3cf4 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Wed, 17 Jan 2024 14:23:16 -0800 Subject: [PATCH 5/6] refac: gpt renamed to openai --- src/lib/components/chat/SettingsModal.svelte | 8 +- src/lib/utils/index.ts | 94 ++++++++++---------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte index f5c2b06e..c79fe106 100644 --- a/src/lib/components/chat/SettingsModal.svelte +++ b/src/lib/components/chat/SettingsModal.svelte @@ -21,7 +21,7 @@ import { WEB_UI_VERSION, WEBUI_API_BASE_URL } from '$lib/constants'; import { config, models, settings, user, chats } from '$lib/stores'; - import { splitStream, getGravatarURL, getImportOrigin, convertGptChats } from '$lib/utils'; + import { splitStream, getGravatarURL, getImportOrigin, convertOpenAIChats } from '$lib/utils'; import Advanced from './Settings/Advanced.svelte'; import Modal from '../common/Modal.svelte'; @@ -132,11 +132,11 @@ reader.onload = (event) => { let chats = JSON.parse(event.target.result); console.log(chats); - if (getImportOrigin(chats) == 'gpt') { + if (getImportOrigin(chats) == 'openai') { try { - chats = convertGptChats(chats); + chats = convertOpenAIChats(chats); } catch (error) { - console.log("Unable to import chats:", error); + console.log('Unable to import chats:', error); } } importChats(chats); diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts index 2c0906dc..c0a2f9ed 100644 --- a/src/lib/utils/index.ts +++ b/src/lib/utils/index.ts @@ -195,68 +195,68 @@ export const calculateSHA256 = async (file) => { export const getImportOrigin = (_chats) => { // Check what external service chat imports are from - if ('mapping' in _chats[0]) { - return 'gpt'; - } - return 'webui'; -} + if ('mapping' in _chats[0]) { + return 'openai'; + } + return 'webui'; +}; -const convertGptMessages = (convo) => { +const convertOpenAIMessages = (convo) => { // Parse OpenAI chat messages and create chat dictionary for creating new chats - const mapping = convo["mapping"]; + const mapping = convo['mapping']; const messages = []; - let currentId = ""; + let currentId = ''; - for (let message_id in mapping) { - const message = mapping[message_id]; + for (let message_id in mapping) { + const message = mapping[message_id]; currentId = message_id; - if (message["message"] == null || message["message"]["content"]["parts"][0] == "") { + if (message['message'] == null || message['message']['content']['parts'][0] == '') { // Skip chat messages with no content continue; } else { const new_chat = { - "id": message_id, - "parentId": messages.length > 0 ? message["parent"] : null, - "childrenIds": message["children"] || [], - "role": message["message"]?.["author"]?.["role"] !== "user" ? "assistant" : "user", - "content": message["message"]?.["content"]?.['parts']?.[0] || "", - "model": '', - "done": true, - "context": null, - } - messages.push(new_chat) + id: message_id, + parentId: messages.length > 0 ? message['parent'] : null, + childrenIds: message['children'] || [], + role: message['message']?.['author']?.['role'] !== 'user' ? 'assistant' : 'user', + content: message['message']?.['content']?.['parts']?.[0] || '', + model: '', + done: true, + context: null + }; + messages.push(new_chat); } - } + } let history = {}; - messages.forEach(obj => history[obj.id] = obj); + messages.forEach((obj) => (history[obj.id] = obj)); const chat = { - "history": { - "currentId": currentId, - "messages": history, // Need to convert this to not a list and instead a json object + history: { + currentId: currentId, + messages: history // Need to convert this to not a list and instead a json object }, - "models": [""], - "messages": messages, - "options": {}, - "timestamp": convo["create_time"], - "title": convo["title"], - } - return chat; -} + models: [''], + messages: messages, + options: {}, + timestamp: convo['create_time'], + title: convo['title'] + }; + return chat; +}; -export const convertGptChats = (_chats) => { +export const convertOpenAIChats = (_chats) => { // Create a list of dictionaries with each conversation from import - const chats = []; - for (let convo of _chats) { - const chat = { - "id": convo["id"], - "user_id": '', - "title": convo["title"], - "chat": convertGptMessages(convo), - "timestamp": convo["timestamp"], - } - chats.push(chat) + const chats = []; + for (let convo of _chats) { + const chat = { + id: convo['id'], + user_id: '', + title: convo['title'], + chat: convertOpenAIMessages(convo), + timestamp: convo['timestamp'] + }; + chats.push(chat); } - return chats; -} + return chats; +}; From b6ab357e8cb8422b224cf72dfa80c6d3950de7c3 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Wed, 17 Jan 2024 14:47:56 -0800 Subject: [PATCH 6/6] fix: more edge cases --- backend/apps/web/routers/chats.py | 40 +++++++++++++++++-------------- src/lib/utils/index.ts | 27 +++++++++++---------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/backend/apps/web/routers/chats.py b/backend/apps/web/routers/chats.py index f061b145..e97e1473 100644 --- a/backend/apps/web/routers/chats.py +++ b/backend/apps/web/routers/chats.py @@ -17,7 +17,8 @@ from apps.web.models.chats import ( ) from utils.utils import ( - bearer_scheme, ) + bearer_scheme, +) from constants import ERROR_MESSAGES router = APIRouter() @@ -29,7 +30,8 @@ router = APIRouter() @router.get("/", response_model=List[ChatTitleIdResponse]) async def get_user_chats( - user=Depends(get_current_user), skip: int = 0, limit: int = 50): + user=Depends(get_current_user), skip: int = 0, limit: int = 50 +): return Chats.get_chat_lists_by_user_id(user.id, skip, limit) @@ -41,9 +43,8 @@ async def get_user_chats( @router.get("/all", response_model=List[ChatResponse]) async def get_all_user_chats(user=Depends(get_current_user)): return [ - ChatResponse(**{ - **chat.model_dump(), "chat": json.loads(chat.chat) - }) for chat in Chats.get_all_chats_by_user_id(user.id) + ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)}) + for chat in Chats.get_all_chats_by_user_id(user.id) ] @@ -54,8 +55,14 @@ async def get_all_user_chats(user=Depends(get_current_user)): @router.post("/new", response_model=Optional[ChatResponse]) async def create_new_chat(form_data: ChatForm, user=Depends(get_current_user)): - chat = Chats.insert_new_chat(user.id, form_data) - return ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)}) + try: + chat = Chats.insert_new_chat(user.id, form_data) + return ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)}) + except Exception as e: + print(e) + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, detail=ERROR_MESSAGES.DEFAULT() + ) ############################ @@ -68,12 +75,11 @@ async def get_chat_by_id(id: str, user=Depends(get_current_user)): chat = Chats.get_chat_by_id_and_user_id(id, user.id) if chat: - return ChatResponse(**{ - **chat.model_dump(), "chat": json.loads(chat.chat) - }) + return ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)}) else: - raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.NOT_FOUND) + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, detail=ERROR_MESSAGES.NOT_FOUND + ) ############################ @@ -82,17 +88,15 @@ async def get_chat_by_id(id: str, user=Depends(get_current_user)): @router.post("/{id}", response_model=Optional[ChatResponse]) -async def update_chat_by_id(id: str, - form_data: ChatForm, - user=Depends(get_current_user)): +async def update_chat_by_id( + id: str, form_data: ChatForm, user=Depends(get_current_user) +): chat = Chats.get_chat_by_id_and_user_id(id, user.id) if chat: updated_chat = {**json.loads(chat.chat), **form_data.chat} chat = Chats.update_chat_by_id(id, updated_chat) - return ChatResponse(**{ - **chat.model_dump(), "chat": json.loads(chat.chat) - }) + return ChatResponse(**{**chat.model_dump(), "chat": json.loads(chat.chat)}) else: raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts index c0a2f9ed..e7dfba2c 100644 --- a/src/lib/utils/index.ts +++ b/src/lib/utils/index.ts @@ -216,11 +216,11 @@ const convertOpenAIMessages = (convo) => { } else { const new_chat = { id: message_id, - parentId: messages.length > 0 ? message['parent'] : null, + parentId: messages.length > 0 && message['parent'] in mapping ? message['parent'] : null, childrenIds: message['children'] || [], role: message['message']?.['author']?.['role'] !== 'user' ? 'assistant' : 'user', content: message['message']?.['content']?.['parts']?.[0] || '', - model: '', + model: 'gpt-3.5-turbo', done: true, context: null }; @@ -236,11 +236,11 @@ const convertOpenAIMessages = (convo) => { currentId: currentId, messages: history // Need to convert this to not a list and instead a json object }, - models: [''], + models: ['gpt-3.5-turbo'], messages: messages, options: {}, timestamp: convo['create_time'], - title: convo['title'] + title: convo['title'] ?? 'New Chat' }; return chat; }; @@ -249,14 +249,17 @@ export const convertOpenAIChats = (_chats) => { // Create a list of dictionaries with each conversation from import const chats = []; for (let convo of _chats) { - const chat = { - id: convo['id'], - user_id: '', - title: convo['title'], - chat: convertOpenAIMessages(convo), - timestamp: convo['timestamp'] - }; - chats.push(chat); + const chat = convertOpenAIMessages(convo); + + if (Object.keys(chat.history.messages).length > 0) { + chats.push({ + id: convo['id'], + user_id: '', + title: convo['title'], + chat: chat, + timestamp: convo['timestamp'] + }); + } } return chats; };