Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
092884fe
"...resnet50_tensorflow.git" did not exist on "5e54ed80719e9fbfbbfd9ca71980bb7639bf55df"
Commit
092884fe
authored
Jan 02, 2024
by
Timothy J. Baek
Browse files
fix: chat general
parent
cb93038a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
6 deletions
+20
-6
src/lib/components/chat/MessageInput.svelte
src/lib/components/chat/MessageInput.svelte
+1
-1
src/lib/components/chat/ModelSelector.svelte
src/lib/components/chat/ModelSelector.svelte
+7
-0
src/routes/(app)/+page.svelte
src/routes/(app)/+page.svelte
+6
-2
src/routes/(app)/c/[id]/+page.svelte
src/routes/(app)/c/[id]/+page.svelte
+6
-3
No files found.
src/lib/components/chat/MessageInput.svelte
View file @
092884fe
...
@@ -298,7 +298,7 @@
...
@@ -298,7 +298,7 @@
id="chat-textarea"
id="chat-textarea"
class=" dark:bg-gray-800 dark:text-gray-100 outline-none w-full py-3 px-2 {fileUploadEnabled
class=" dark:bg-gray-800 dark:text-gray-100 outline-none w-full py-3 px-2 {fileUploadEnabled
? ''
? ''
: ' pl-4'} rounded-xl resize-none"
: ' pl-4'} rounded-xl resize-none
h-[48px]
"
placeholder={speechRecognitionListening ? 'Listening...' : 'Send a message'}
placeholder={speechRecognitionListening ? 'Listening...' : 'Send a message'}
bind:value={prompt}
bind:value={prompt}
on:keypress={(e) => {
on:keypress={(e) => {
...
...
src/lib/components/chat/ModelSelector.svelte
View file @
092884fe
<script lang="ts">
<script lang="ts">
import { models, showSettings, settings } from '$lib/stores';
import { models, showSettings, settings } from '$lib/stores';
import { onMount, tick } from 'svelte';
import toast from 'svelte-french-toast';
import toast from 'svelte-french-toast';
export let selectedModels = [''];
export let selectedModels = [''];
...
@@ -15,6 +16,12 @@
...
@@ -15,6 +16,12 @@
localStorage.setItem('settings', JSON.stringify($settings));
localStorage.setItem('settings', JSON.stringify($settings));
toast.success('Default model updated');
toast.success('Default model updated');
};
};
$: if (selectedModels.length > 0 && $models.length > 0) {
selectedModels = selectedModels.map((model) =>
$models.map((m) => m.name).includes(model) ? model : ''
);
}
</script>
</script>
<div class="flex flex-col my-2">
<div class="flex flex-col my-2">
...
...
src/routes/(app)/+page.svelte
View file @
092884fe
...
@@ -109,10 +109,14 @@
...
@@ -109,10 +109,14 @@
await Promise.all(
await Promise.all(
selectedModels.map(async (model) => {
selectedModels.map(async (model) => {
console.log(model);
console.log(model);
if ($models.filter((m) => m.name === model)[0].external) {
const modelTag = $models.filter((m) => m.name === model).at(0);
if (modelTag?.external) {
await sendPromptOpenAI(model, prompt, parentId, _chatId);
await sendPromptOpenAI(model, prompt, parentId, _chatId);
} else {
} else
if (modelTag)
{
await sendPromptOllama(model, prompt, parentId, _chatId);
await sendPromptOllama(model, prompt, parentId, _chatId);
} else {
toast.error(`Model ${model} not found`);
}
}
})
})
);
);
...
...
src/routes/(app)/c/[id]/+page.svelte
View file @
092884fe
...
@@ -136,17 +136,20 @@
...
@@ -136,17 +136,20 @@
await Promise.all(
await Promise.all(
selectedModels.map(async (model) => {
selectedModels.map(async (model) => {
console.log(model);
console.log(model);
if ($models.filter((m) => m.name === model)[0].external) {
const modelTag = $models.filter((m) => m.name === model).at(0);
if (modelTag?.external) {
await sendPromptOpenAI(model, prompt, parentId, _chatId);
await sendPromptOpenAI(model, prompt, parentId, _chatId);
} else {
} else
if (modelTag)
{
await sendPromptOllama(model, prompt, parentId, _chatId);
await sendPromptOllama(model, prompt, parentId, _chatId);
} else {
toast.error(`Model ${model} not found`);
}
}
})
})
);
);
await chats.set(await getChatList(localStorage.token));
await chats.set(await getChatList(localStorage.token));
};
};
const sendPromptOllama = async (model, userPrompt, parentId, _chatId) => {
const sendPromptOllama = async (model, userPrompt, parentId, _chatId) => {
// Create response message
// Create response message
let responseMessageId = uuidv4();
let responseMessageId = uuidv4();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment