|
@@ -2,23 +2,27 @@
|
|
|
import { v4 as uuidv4 } from 'uuid';
|
|
|
import toast from 'svelte-french-toast';
|
|
|
|
|
|
- import { onDestroy, onMount, tick } from 'svelte';
|
|
|
+ import { onMount, tick } from 'svelte';
|
|
|
import { goto } from '$app/navigation';
|
|
|
import { page } from '$app/stores';
|
|
|
|
|
|
- import { config, models, modelfiles, user, settings, db, chats, chatId } from '$lib/stores';
|
|
|
+ import { models, modelfiles, user, settings, db, chats, chatId } from '$lib/stores';
|
|
|
import { OLLAMA_API_BASE_URL } from '$lib/constants';
|
|
|
- import { splitStream } from '$lib/utils';
|
|
|
+
|
|
|
+ import { generateChatCompletion, generateTitle } from '$lib/apis/ollama';
|
|
|
+ import { copyToClipboard, splitStream } from '$lib/utils';
|
|
|
|
|
|
import MessageInput from '$lib/components/chat/MessageInput.svelte';
|
|
|
import Messages from '$lib/components/chat/Messages.svelte';
|
|
|
import ModelSelector from '$lib/components/chat/ModelSelector.svelte';
|
|
|
import Navbar from '$lib/components/layout/Navbar.svelte';
|
|
|
+ import { createNewChat, getChatList, updateChatById } from '$lib/apis/chats';
|
|
|
|
|
|
let stopResponseFlag = false;
|
|
|
let autoScroll = true;
|
|
|
|
|
|
let selectedModels = [''];
|
|
|
+
|
|
|
let selectedModelfile = null;
|
|
|
$: selectedModelfile =
|
|
|
selectedModels.length === 1 &&
|
|
@@ -83,41 +87,6 @@
|
|
|
});
|
|
|
};
|
|
|
|
|
|
- const copyToClipboard = (text) => {
|
|
|
- if (!navigator.clipboard) {
|
|
|
- var textArea = document.createElement('textarea');
|
|
|
- textArea.value = text;
|
|
|
-
|
|
|
- // Avoid scrolling to bottom
|
|
|
- textArea.style.top = '0';
|
|
|
- textArea.style.left = '0';
|
|
|
- textArea.style.position = 'fixed';
|
|
|
-
|
|
|
- document.body.appendChild(textArea);
|
|
|
- textArea.focus();
|
|
|
- textArea.select();
|
|
|
-
|
|
|
- try {
|
|
|
- var successful = document.execCommand('copy');
|
|
|
- var msg = successful ? 'successful' : 'unsuccessful';
|
|
|
- console.log('Fallback: Copying text command was ' + msg);
|
|
|
- } catch (err) {
|
|
|
- console.error('Fallback: Oops, unable to copy', err);
|
|
|
- }
|
|
|
-
|
|
|
- document.body.removeChild(textArea);
|
|
|
- return;
|
|
|
- }
|
|
|
- navigator.clipboard.writeText(text).then(
|
|
|
- function () {
|
|
|
- console.log('Async: Copying to clipboard was successful!');
|
|
|
- },
|
|
|
- function (err) {
|
|
|
- console.error('Async: Could not copy text: ', err);
|
|
|
- }
|
|
|
- );
|
|
|
- };
|
|
|
-
|
|
|
//////////////////////////
|
|
|
// Ollama functions
|
|
|
//////////////////////////
|
|
@@ -135,11 +104,11 @@
|
|
|
})
|
|
|
);
|
|
|
|
|
|
- await chats.set(await $db.getChats());
|
|
|
+ await chats.set(await getChatList(localStorage.token));
|
|
|
};
|
|
|
|
|
|
const sendPromptOllama = async (model, userPrompt, parentId, _chatId) => {
|
|
|
- console.log('sendPromptOllama');
|
|
|
+ // Create response message
|
|
|
let responseMessageId = uuidv4();
|
|
|
let responseMessage = {
|
|
|
parentId: parentId,
|
|
@@ -150,8 +119,11 @@
|
|
|
model: model
|
|
|
};
|
|
|
|
|
|
+ // Add message to history and Set currentId to messageId
|
|
|
history.messages[responseMessageId] = responseMessage;
|
|
|
history.currentId = responseMessageId;
|
|
|
+
|
|
|
+ // Append messageId to childrenIds of parent message
|
|
|
if (parentId !== null) {
|
|
|
history.messages[parentId].childrenIds = [
|
|
|
...history.messages[parentId].childrenIds,
|
|
@@ -159,17 +131,16 @@
|
|
|
];
|
|
|
}
|
|
|
|
|
|
+ // Wait until history/message have been updated
|
|
|
await tick();
|
|
|
+
|
|
|
+ // Scroll down
|
|
|
window.scrollTo({ top: document.body.scrollHeight });
|
|
|
|
|
|
- const res = await fetch(`${$settings?.API_BASE_URL ?? OLLAMA_API_BASE_URL}/chat`, {
|
|
|
- method: 'POST',
|
|
|
- headers: {
|
|
|
- 'Content-Type': 'text/event-stream',
|
|
|
- ...($settings.authHeader && { Authorization: $settings.authHeader }),
|
|
|
- ...($user && { Authorization: `Bearer ${localStorage.token}` })
|
|
|
- },
|
|
|
- body: JSON.stringify({
|
|
|
+ const res = await generateChatCompletion(
|
|
|
+ $settings?.API_BASE_URL ?? OLLAMA_API_BASE_URL,
|
|
|
+ localStorage.token,
|
|
|
+ {
|
|
|
model: model,
|
|
|
messages: [
|
|
|
$settings.system
|
|
@@ -191,20 +162,11 @@
|
|
|
})
|
|
|
})),
|
|
|
options: {
|
|
|
- seed: $settings.seed ?? undefined,
|
|
|
- temperature: $settings.temperature ?? undefined,
|
|
|
- repeat_penalty: $settings.repeat_penalty ?? undefined,
|
|
|
- top_k: $settings.top_k ?? undefined,
|
|
|
- top_p: $settings.top_p ?? undefined,
|
|
|
- num_ctx: $settings.num_ctx ?? undefined,
|
|
|
...($settings.options ?? {})
|
|
|
},
|
|
|
format: $settings.requestFormat ?? undefined
|
|
|
- })
|
|
|
- }).catch((err) => {
|
|
|
- console.log(err);
|
|
|
- return null;
|
|
|
- });
|
|
|
+ }
|
|
|
+ );
|
|
|
|
|
|
if (res && res.ok) {
|
|
|
const reader = res.body
|
|
@@ -296,23 +258,11 @@
|
|
|
}
|
|
|
|
|
|
if ($chatId == _chatId) {
|
|
|
- chat = await $db.updateChatById(_chatId, {
|
|
|
- ...chat.chat,
|
|
|
- title: title === '' ? 'New Chat' : title,
|
|
|
- models: selectedModels,
|
|
|
- system: $settings.system ?? undefined,
|
|
|
- options: {
|
|
|
- seed: $settings.seed ?? undefined,
|
|
|
- temperature: $settings.temperature ?? undefined,
|
|
|
- repeat_penalty: $settings.repeat_penalty ?? undefined,
|
|
|
- top_k: $settings.top_k ?? undefined,
|
|
|
- top_p: $settings.top_p ?? undefined,
|
|
|
- num_ctx: $settings.num_ctx ?? undefined,
|
|
|
- ...($settings.options ?? {})
|
|
|
- },
|
|
|
+ chat = await updateChatById(localStorage.token, _chatId, {
|
|
|
messages: messages,
|
|
|
history: history
|
|
|
});
|
|
|
+ await chats.set(await getChatList(localStorage.token));
|
|
|
}
|
|
|
} else {
|
|
|
if (res !== null) {
|
|
@@ -338,6 +288,7 @@
|
|
|
|
|
|
stopResponseFlag = false;
|
|
|
await tick();
|
|
|
+
|
|
|
if (autoScroll) {
|
|
|
window.scrollTo({ top: document.body.scrollHeight });
|
|
|
}
|
|
@@ -483,23 +434,11 @@
|
|
|
}
|
|
|
|
|
|
if ($chatId == _chatId) {
|
|
|
- chat = await $db.updateChatById(_chatId, {
|
|
|
- ...chat.chat,
|
|
|
- title: title === '' ? 'New Chat' : title,
|
|
|
- models: selectedModels,
|
|
|
- system: $settings.system ?? undefined,
|
|
|
- options: {
|
|
|
- seed: $settings.seed ?? undefined,
|
|
|
- temperature: $settings.temperature ?? undefined,
|
|
|
- repeat_penalty: $settings.repeat_penalty ?? undefined,
|
|
|
- top_k: $settings.top_k ?? undefined,
|
|
|
- top_p: $settings.top_p ?? undefined,
|
|
|
- num_ctx: $settings.num_ctx ?? undefined,
|
|
|
- ...($settings.options ?? {})
|
|
|
- },
|
|
|
+ chat = await updateChatById(localStorage.token, _chatId, {
|
|
|
messages: messages,
|
|
|
history: history
|
|
|
});
|
|
|
+ await chats.set(await getChatList(localStorage.token));
|
|
|
}
|
|
|
} else {
|
|
|
if (res !== null) {
|
|
@@ -549,10 +488,13 @@
|
|
|
if (selectedModels.includes('')) {
|
|
|
toast.error('Model not selected');
|
|
|
} else if (messages.length != 0 && messages.at(-1).done != true) {
|
|
|
+ // Response not done
|
|
|
console.log('wait');
|
|
|
} else {
|
|
|
+ // Reset chat message textarea height
|
|
|
document.getElementById('chat-textarea').style.height = '';
|
|
|
|
|
|
+ // Create user message
|
|
|
let userMessageId = uuidv4();
|
|
|
let userMessage = {
|
|
|
id: userMessageId,
|
|
@@ -563,47 +505,42 @@
|
|
|
files: files.length > 0 ? files : undefined
|
|
|
};
|
|
|
|
|
|
+ // Add message to history and Set currentId to messageId
|
|
|
+ history.messages[userMessageId] = userMessage;
|
|
|
+ history.currentId = userMessageId;
|
|
|
+
|
|
|
+ // Append messageId to childrenIds of parent message
|
|
|
if (messages.length !== 0) {
|
|
|
history.messages[messages.at(-1).id].childrenIds.push(userMessageId);
|
|
|
}
|
|
|
|
|
|
- history.messages[userMessageId] = userMessage;
|
|
|
- history.currentId = userMessageId;
|
|
|
-
|
|
|
+ // Wait until history/message have been updated
|
|
|
await tick();
|
|
|
|
|
|
+ // Create new chat if only one message in messages
|
|
|
if (messages.length == 1) {
|
|
|
- chat = await $db.createNewChat({
|
|
|
+ chat = await createNewChat(localStorage.token, {
|
|
|
id: $chatId,
|
|
|
title: 'New Chat',
|
|
|
models: selectedModels,
|
|
|
system: $settings.system ?? undefined,
|
|
|
options: {
|
|
|
- seed: $settings.seed ?? undefined,
|
|
|
- temperature: $settings.temperature ?? undefined,
|
|
|
- repeat_penalty: $settings.repeat_penalty ?? undefined,
|
|
|
- top_k: $settings.top_k ?? undefined,
|
|
|
- top_p: $settings.top_p ?? undefined,
|
|
|
- num_ctx: $settings.num_ctx ?? undefined,
|
|
|
...($settings.options ?? {})
|
|
|
},
|
|
|
messages: messages,
|
|
|
- history: history
|
|
|
+ history: history,
|
|
|
+ timestamp: Date.now()
|
|
|
});
|
|
|
-
|
|
|
- console.log(chat);
|
|
|
-
|
|
|
+ await chats.set(await getChatList(localStorage.token));
|
|
|
await chatId.set(chat.id);
|
|
|
await tick();
|
|
|
}
|
|
|
|
|
|
+ // Reset chat input textarea
|
|
|
prompt = '';
|
|
|
files = [];
|
|
|
|
|
|
- setTimeout(() => {
|
|
|
- window.scrollTo({ top: document.body.scrollHeight, behavior: 'smooth' });
|
|
|
- }, 50);
|
|
|
-
|
|
|
+ // Send prompt
|
|
|
await sendPrompt(userPrompt, userMessageId);
|
|
|
}
|
|
|
};
|
|
@@ -614,9 +551,7 @@
|
|
|
};
|
|
|
|
|
|
const regenerateResponse = async () => {
|
|
|
- const _chatId = JSON.parse(JSON.stringify($chatId));
|
|
|
- console.log('regenerateResponse', _chatId);
|
|
|
-
|
|
|
+ console.log('regenerateResponse');
|
|
|
if (messages.length != 0 && messages.at(-1).done == true) {
|
|
|
messages.splice(messages.length - 1, 1);
|
|
|
messages = messages;
|
|
@@ -624,40 +559,21 @@
|
|
|
let userMessage = messages.at(-1);
|
|
|
let userPrompt = userMessage.content;
|
|
|
|
|
|
- await sendPrompt(userPrompt, userMessage.id, _chatId);
|
|
|
+ await sendPrompt(userPrompt, userMessage.id);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
const generateChatTitle = async (_chatId, userPrompt) => {
|
|
|
if ($settings.titleAutoGenerate ?? true) {
|
|
|
- console.log('generateChatTitle');
|
|
|
-
|
|
|
- const res = await fetch(`${$settings?.API_BASE_URL ?? OLLAMA_API_BASE_URL}/generate`, {
|
|
|
- method: 'POST',
|
|
|
- headers: {
|
|
|
- 'Content-Type': 'text/event-stream',
|
|
|
- ...($user && { Authorization: `Bearer ${localStorage.token}` })
|
|
|
- },
|
|
|
- body: JSON.stringify({
|
|
|
- model: selectedModels[0],
|
|
|
- prompt: `Generate a brief 3-5 word title for this question, excluding the term 'title.' Then, please reply with only the title: ${userPrompt}`,
|
|
|
- stream: false
|
|
|
- })
|
|
|
- })
|
|
|
- .then(async (res) => {
|
|
|
- if (!res.ok) throw await res.json();
|
|
|
- return res.json();
|
|
|
- })
|
|
|
- .catch((error) => {
|
|
|
- if ('detail' in error) {
|
|
|
- toast.error(error.detail);
|
|
|
- }
|
|
|
- console.log(error);
|
|
|
- return null;
|
|
|
- });
|
|
|
-
|
|
|
- if (res) {
|
|
|
- await setChatTitle(_chatId, res.response === '' ? 'New Chat' : res.response);
|
|
|
+ const title = await generateTitle(
|
|
|
+ $settings?.API_BASE_URL ?? OLLAMA_API_BASE_URL,
|
|
|
+ localStorage.token,
|
|
|
+ selectedModels[0],
|
|
|
+ userPrompt
|
|
|
+ );
|
|
|
+
|
|
|
+ if (title) {
|
|
|
+ await setChatTitle(_chatId, title);
|
|
|
}
|
|
|
} else {
|
|
|
await setChatTitle(_chatId, `${userPrompt}`);
|
|
@@ -665,10 +581,12 @@
|
|
|
};
|
|
|
|
|
|
const setChatTitle = async (_chatId, _title) => {
|
|
|
- chat = await $db.updateChatById(_chatId, { ...chat.chat, title: _title });
|
|
|
if (_chatId === $chatId) {
|
|
|
title = _title;
|
|
|
}
|
|
|
+
|
|
|
+ chat = await updateChatById(localStorage.token, _chatId, { title: _title });
|
|
|
+ await chats.set(await getChatList(localStorage.token));
|
|
|
};
|
|
|
</script>
|
|
|
|