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
83097cd8
Commit
83097cd8
authored
May 24, 2024
by
Timothy J. Baek
Browse files
refac: remove modelfiles completely
parent
c8393db9
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
24 additions
and
49 deletions
+24
-49
src/lib/components/chat/MessageInput.svelte
src/lib/components/chat/MessageInput.svelte
+1
-1
src/lib/components/chat/Messages/CompareMessages.svelte
src/lib/components/chat/Messages/CompareMessages.svelte
+0
-3
src/lib/components/chat/Messages/UserMessage.svelte
src/lib/components/chat/Messages/UserMessage.svelte
+4
-9
src/lib/components/chat/ShareChatModal.svelte
src/lib/components/chat/ShareChatModal.svelte
+2
-4
src/lib/components/layout/Navbar.svelte
src/lib/components/layout/Navbar.svelte
+0
-1
src/lib/components/workspace/Models.svelte
src/lib/components/workspace/Models.svelte
+10
-9
src/routes/(app)/+layout.svelte
src/routes/(app)/+layout.svelte
+0
-1
src/routes/(app)/workspace/models/create/+page.svelte
src/routes/(app)/workspace/models/create/+page.svelte
+1
-1
src/routes/modelfiles/create/+page.svelte
src/routes/modelfiles/create/+page.svelte
+3
-3
src/routes/s/[id]/+page.svelte
src/routes/s/[id]/+page.svelte
+3
-17
No files found.
src/lib/components/chat/MessageInput.svelte
View file @
83097cd8
<script lang="ts">
<script lang="ts">
import { toast } from 'svelte-sonner';
import { toast } from 'svelte-sonner';
import { onMount, tick, getContext } from 'svelte';
import { onMount, tick, getContext } from 'svelte';
import { type Model, mobile,
modelfiles,
settings, showSidebar, models } from '$lib/stores';
import { type Model, mobile, settings, showSidebar, models } from '$lib/stores';
import { blobToFile, calculateSHA256, findWordIndices } from '$lib/utils';
import { blobToFile, calculateSHA256, findWordIndices } from '$lib/utils';
import {
import {
...
...
src/lib/components/chat/Messages/CompareMessages.svelte
View file @
83097cd8
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
export let parentMessage;
export let parentMessage;
export let selectedModelfiles;
export let updateChatMessages: Function;
export let updateChatMessages: Function;
export let confirmEditResponseMessage: Function;
export let confirmEditResponseMessage: Function;
export let rateMessage: Function;
export let rateMessage: Function;
...
@@ -130,7 +128,6 @@
...
@@ -130,7 +128,6 @@
>
>
<ResponseMessage
<ResponseMessage
message={groupedMessages[model].messages[groupedMessagesIdx[model]]}
message={groupedMessages[model].messages[groupedMessagesIdx[model]]}
modelfiles={selectedModelfiles}
siblings={groupedMessages[model].messages.map((m) => m.id)}
siblings={groupedMessages[model].messages.map((m) => m.id)}
isLastMessage={true}
isLastMessage={true}
{updateChatMessages}
{updateChatMessages}
...
...
src/lib/components/chat/Messages/UserMessage.svelte
View file @
83097cd8
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
import { tick, createEventDispatcher, getContext } from 'svelte';
import { tick, createEventDispatcher, getContext } from 'svelte';
import Name from './Name.svelte';
import Name from './Name.svelte';
import ProfileImage from './ProfileImage.svelte';
import ProfileImage from './ProfileImage.svelte';
import { model
file
s, settings } from '$lib/stores';
import { models, settings } from '$lib/stores';
import Tooltip from '$lib/components/common/Tooltip.svelte';
import Tooltip from '$lib/components/common/Tooltip.svelte';
import { user as _user } from '$lib/stores';
import { user as _user } from '$lib/stores';
...
@@ -60,8 +60,7 @@
...
@@ -60,8 +60,7 @@
{#if !($settings?.chatBubble ?? true)}
{#if !($settings?.chatBubble ?? true)}
<ProfileImage
<ProfileImage
src={message.user
src={message.user
? $modelfiles.find((modelfile) => modelfile.tagName === message.user)?.imageUrl ??
? $models.find((m) => m.id === message.user)?.info?.meta?.profile_image_url ?? '/user.png'
'/user.png'
: user?.profile_image_url ?? '/user.png'}
: user?.profile_image_url ?? '/user.png'}
/>
/>
{/if}
{/if}
...
@@ -70,12 +69,8 @@
...
@@ -70,12 +69,8 @@
<div>
<div>
<Name>
<Name>
{#if message.user}
{#if message.user}
{#if $modelfiles.map((modelfile) => modelfile.tagName).includes(message.user)}
{$i18n.t('You')}
{$modelfiles.find((modelfile) => modelfile.tagName === message.user)?.title}
<span class=" text-gray-500 text-sm font-medium">{message?.user ?? ''}</span>
{:else}
{$i18n.t('You')}
<span class=" text-gray-500 text-sm font-medium">{message?.user ?? ''}</span>
{/if}
{:else if $settings.showUsername || $_user.name !== user.name}
{:else if $settings.showUsername || $_user.name !== user.name}
{user.name}
{user.name}
{:else}
{:else}
...
...
src/lib/components/chat/ShareChatModal.svelte
View file @
83097cd8
<script lang="ts">
<script lang="ts">
import { getContext, onMount } from 'svelte';
import { getContext, onMount } from 'svelte';
import { models } from '$lib/stores';
import { toast } from 'svelte-sonner';
import { toast } from 'svelte-sonner';
import { deleteSharedChatById, getChatById, shareChatById } from '$lib/apis/chats';
import { deleteSharedChatById, getChatById, shareChatById } from '$lib/apis/chats';
import { modelfiles } from '$lib/stores';
import { copyToClipboard } from '$lib/utils';
import { copyToClipboard } from '$lib/utils';
import Modal from '../common/Modal.svelte';
import Modal from '../common/Modal.svelte';
...
@@ -43,9 +43,7 @@
...
@@ -43,9 +43,7 @@
tab.postMessage(
tab.postMessage(
JSON.stringify({
JSON.stringify({
chat: _chat,
chat: _chat,
modelfiles: $modelfiles.filter((modelfile) =>
models: $models.filter((m) => _chat.models.includes(m.id))
_chat.models.includes(modelfile.tagName)
)
}),
}),
'*'
'*'
);
);
...
...
src/lib/components/layout/Navbar.svelte
View file @
83097cd8
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
WEBUI_NAME,
WEBUI_NAME,
chatId,
chatId,
mobile,
mobile,
modelfiles,
settings,
settings,
showArchivedChats,
showArchivedChats,
showSettings,
showSettings,
...
...
src/lib/components/workspace/Models.svelte
View file @
83097cd8
...
@@ -16,8 +16,9 @@
...
@@ -16,8 +16,9 @@
const i18n = getContext('i18n');
const i18n = getContext('i18n');
let localModelfiles = [];
let localModelfiles = [];
let importFiles;
let importFiles;
let model
file
sImportInputElement: HTMLInputElement;
let modelsImportInputElement: HTMLInputElement;
const deleteModelHandler = async (model) => {
const deleteModelHandler = async (model) => {
console.log(model.info);
console.log(model.info);
...
@@ -243,8 +244,8 @@
...
@@ -243,8 +244,8 @@
<div class=" flex justify-end w-full mb-3">
<div class=" flex justify-end w-full mb-3">
<div class="flex space-x-1">
<div class="flex space-x-1">
<input
<input
id="model
file
s-import-input"
id="models-import-input"
bind:this={model
file
sImportInputElement}
bind:this={modelsImportInputElement}
bind:files={importFiles}
bind:files={importFiles}
type="file"
type="file"
accept=".json"
accept=".json"
...
@@ -254,16 +255,16 @@
...
@@ -254,16 +255,16 @@
let reader = new FileReader();
let reader = new FileReader();
reader.onload = async (event) => {
reader.onload = async (event) => {
let savedModel
file
s = JSON.parse(event.target.result);
let savedModels = JSON.parse(event.target.result);
console.log(savedModel
file
s);
console.log(savedModels);
for (const model
file
of savedModel
file
s) {
for (const model of savedModels) {
await addNewModel(localStorage.token, model
file
).catch((error) => {
await addNewModel(localStorage.token, model).catch((error) => {
return null;
return null;
});
});
}
}
await model
file
s.set(await getModel
Info
s(localStorage.token));
await models.set(await getModels(localStorage.token));
};
};
reader.readAsText(importFiles[0]);
reader.readAsText(importFiles[0]);
...
@@ -273,7 +274,7 @@
...
@@ -273,7 +274,7 @@
<button
<button
class="flex text-xs items-center space-x-1 px-3 py-1.5 rounded-xl bg-gray-50 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 dark:text-gray-200 transition"
class="flex text-xs items-center space-x-1 px-3 py-1.5 rounded-xl bg-gray-50 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 dark:text-gray-200 transition"
on:click={() => {
on:click={() => {
model
file
sImportInputElement.click();
modelsImportInputElement.click();
}}
}}
>
>
<div class=" self-center mr-2 font-medium">{$i18n.t('Import Models')}</div>
<div class=" self-center mr-2 font-medium">{$i18n.t('Import Models')}</div>
...
...
src/routes/(app)/+layout.svelte
View file @
83097cd8
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
showSettings,
showSettings,
settings,
settings,
models,
models,
modelfiles,
prompts,
prompts,
documents,
documents,
tags,
tags,
...
...
src/routes/(app)/workspace/models/create/+page.svelte
View file @
83097cd8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
import { v4 as uuidv4 } from 'uuid';
import { v4 as uuidv4 } from 'uuid';
import { toast } from 'svelte-sonner';
import { toast } from 'svelte-sonner';
import { goto } from '$app/navigation';
import { goto } from '$app/navigation';
import { settings, user, config,
modelfiles,
models } from '$lib/stores';
import { settings, user, config, models } from '$lib/stores';
import { onMount, tick, getContext } from 'svelte';
import { onMount, tick, getContext } from 'svelte';
import { addNewModel, getModelById, getModelInfos } from '$lib/apis/models';
import { addNewModel, getModelById, getModelInfos } from '$lib/apis/models';
...
...
src/routes/modelfiles/create/+page.svelte
View file @
83097cd8
...
@@ -14,10 +14,10 @@
...
@@ -14,10 +14,10 @@
].includes(event.origin)
].includes(event.origin)
)
)
return;
return;
const model
file
= JSON.parse(event.data);
const model = JSON.parse(event.data);
sessionStorage.model
file
= JSON.stringify(model
file
);
sessionStorage.model = JSON.stringify(model);
goto('/workspace/model
file
s/create');
goto('/workspace/models/create');
});
});
if (window.opener ?? false) {
if (window.opener ?? false) {
...
...
src/routes/s/[id]/+page.svelte
View file @
83097cd8
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
import dayjs from 'dayjs';
import dayjs from 'dayjs';
import {
modelfiles,
settings, chatId, WEBUI_NAME } from '$lib/stores';
import { settings, chatId, WEBUI_NAME
, models
} from '$lib/stores';
import { convertMessagesToHistory } from '$lib/utils';
import { convertMessagesToHistory } from '$lib/utils';
import { getChatByShareId } from '$lib/apis/chats';
import { getChatByShareId } from '$lib/apis/chats';
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
import Navbar from '$lib/components/layout/Navbar.svelte';
import Navbar from '$lib/components/layout/Navbar.svelte';
import { getUserById } from '$lib/apis/users';
import { getUserById } from '$lib/apis/users';
import { error } from '@sveltejs/kit';
import { error } from '@sveltejs/kit';
import { getModels } from '$lib/apis';
const i18n = getContext('i18n');
const i18n = getContext('i18n');
...
@@ -27,17 +28,6 @@
...
@@ -27,17 +28,6 @@
let showModelSelector = false;
let showModelSelector = false;
let selectedModels = [''];
let selectedModels = [''];
let selectedModelfiles = {};
$: selectedModelfiles = selectedModels.reduce((a, tagName, i, arr) => {
const modelfile =
$modelfiles.filter((modelfile) => modelfile.tagName === tagName)?.at(0) ?? undefined;
return {
...a,
...(modelfile && { [tagName]: modelfile })
};
}, {});
let chat = null;
let chat = null;
let user = null;
let user = null;
...
@@ -69,10 +59,6 @@
...
@@ -69,10 +59,6 @@
if (await loadSharedChat()) {
if (await loadSharedChat()) {
await tick();
await tick();
loaded = true;
loaded = true;
window.setTimeout(() => scrollToBottom(), 0);
const chatInput = document.getElementById('chat-textarea');
chatInput?.focus();
} else {
} else {
await goto('/');
await goto('/');
}
}
...
@@ -84,6 +70,7 @@
...
@@ -84,6 +70,7 @@
//////////////////////////
//////////////////////////
const loadSharedChat = async () => {
const loadSharedChat = async () => {
await models.set(await getModels(localStorage.token));
await chatId.set($page.params.id);
await chatId.set($page.params.id);
chat = await getChatByShareId(localStorage.token, $chatId).catch(async (error) => {
chat = await getChatByShareId(localStorage.token, $chatId).catch(async (error) => {
await goto('/');
await goto('/');
...
@@ -168,7 +155,6 @@
...
@@ -168,7 +155,6 @@
chatId={$chatId}
chatId={$chatId}
readOnly={true}
readOnly={true}
{selectedModels}
{selectedModels}
{selectedModelfiles}
{processing}
{processing}
bind:history
bind:history
bind:messages
bind:messages
...
...
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