Skip to content

GitLab

Unverified Commit 099b1d06 authored by Jannik S's avatar Jannik S Committed by GitHub
Browse files

Revert "Merge Updates & Dockerfile improvements" (#3) 

This reverts commit 9763d885.
parent 9763d885
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 240 deletions
src/routes/(app)/modelfiles/+page.svelte
View file @ 099b1d06
......@@ -3,7 +3,7 @@
import fileSaver from 'file-saver';
const { saveAs } = fileSaver;
import { onMount, getContext } from 'svelte';
import { onMount } from 'svelte';
import { WEBUI_NAME, modelfiles, settings, user } from '$lib/stores';
import { createModel, deleteModel } from '$lib/apis/ollama';
......@@ -14,8 +14,6 @@
} from '$lib/apis/modelfiles';
import { goto } from '$app/navigation';
const i18n = getContext('i18n');
let localModelfiles = [];
let importFiles;
let modelfilesImportInputElement: HTMLInputElement;
......@@ -28,7 +26,7 @@
});
if (success) {
toast.success($i18n.t(`Deleted {tagName}`, { tagName }));
toast.success(`Deleted ${tagName}`);
}
return success;
......@@ -41,7 +39,7 @@
};
const shareModelfile = async (modelfile) => {
toast.success($i18n.t('Redirecting you to OpenWebUI Community'));
toast.success('Redirecting you to OpenWebUI Community');
const url = 'https://openwebui.com';
......@@ -76,14 +74,14 @@
<svelte:head>
<title>
{$i18n.t('Modelfiles')} | {$WEBUI_NAME}
{`Modelfiles | ${$WEBUI_NAME}`}
</title>
</svelte:head>
<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
<div class="flex flex-col justify-between w-full overflow-y-auto">
<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
<div class=" text-2xl font-semibold mb-3">{$i18n.t('My Modelfiles')}</div>
<div class=" text-2xl font-semibold mb-3">My Modelfiles</div>
<a class=" flex space-x-4 cursor-pointer w-full mb-2 px-3 py-2" href="/modelfiles/create">
<div class=" self-center w-10">
......@@ -106,8 +104,8 @@
</div>
<div class=" self-center">
<div class=" font-bold">{$i18n.t('Create a modelfile')}</div>
<div class=" text-sm">{$i18n.t('Customize Ollama models for a specific purpose')}</div>
<div class=" font-bold">Create a modelfile</div>
<div class=" text-sm">Customize Ollama models for a specific purpose</div>
</div>
</a>
......@@ -272,7 +270,7 @@
modelfilesImportInputElement.click();
}}
>
<div class=" self-center mr-2 font-medium">{$i18n.t('Import Modelfiles')}</div>
<div class=" self-center mr-2 font-medium">Import Modelfiles</div>
<div class=" self-center">
<svg
......@@ -296,7 +294,7 @@
saveModelfiles($modelfiles);
}}
>
<div class=" self-center mr-2 font-medium">{$i18n.t('Export Modelfiles')}</div>
<div class=" self-center mr-2 font-medium">Export Modelfiles</div>
<div class=" self-center">
<svg
......@@ -337,7 +335,7 @@
await modelfiles.set(await getModelfiles(localStorage.token));
}}
>
<div class=" self-center mr-2 font-medium">{$i18n.t('Sync All')}</div>
<div class=" self-center mr-2 font-medium">Sync All</div>
<div class=" self-center">
<svg
......@@ -388,7 +386,7 @@
</div>
<div class=" my-16">
<div class=" text-2xl font-semibold mb-3">{$i18n.t('Made by OpenWebUI Community')}</div>
<div class=" text-2xl font-semibold mb-3">Made by OpenWebUI Community</div>
<a
class=" flex space-x-4 cursor-pointer w-full mb-2 px-3 py-2"
......@@ -415,8 +413,8 @@
</div>
<div class=" self-center">
<div class=" font-bold">{$i18n.t('Discover a modelfile')}</div>
<div class=" text-sm">{$i18n.t('Discover, download, and explore model presets')}</div>
<div class=" font-bold">Discover a modelfile</div>
<div class=" text-sm">Discover, download, and explore model presets</div>
</div>
</a>
</div>
......
src/routes/(app)/modelfiles/create/+page.svelte
View file @ 099b1d06
......@@ -6,12 +6,10 @@
import AdvancedParams from '$lib/components/chat/Settings/Advanced/AdvancedParams.svelte';
import { splitStream } from '$lib/utils';
import { onMount, tick, getContext } from 'svelte';
import { onMount, tick } from 'svelte';
import { createModel } from '$lib/apis/ollama';
import { createNewModelfile, getModelfileByTagName, getModelfiles } from '$lib/apis/modelfiles';
const i18n = getContext('i18n');
let loading = false;
let filesInputElement;
......@@ -351,7 +349,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
}}
/>
<div class=" text-2xl font-semibold mb-6">{$i18n.t('My Modelfiles')}</div>
<div class=" text-2xl font-semibold mb-6">My Modelfiles</div>
<button
class="flex space-x-1"
......@@ -373,7 +371,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
/>
</svg>
</div>
<div class=" self-center font-medium text-sm">{$i18n.t('Back')}</div>
<div class=" self-center font-medium text-sm">Back</div>
</button>
<hr class="my-3 dark:border-gray-700" />
......@@ -420,12 +418,12 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
<div class="my-2 flex space-x-2">
<div class="flex-1">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Name')}*</div>
<div class=" text-sm font-semibold mb-2">Name*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Name your modelfile')}
placeholder="Name your modelfile"
bind:value={title}
required
/>
......@@ -433,12 +431,12 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
</div>
<div class="flex-1">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Model Tag Name')}*</div>
<div class=" text-sm font-semibold mb-2">Model Tag Name*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Add a model tag name')}
placeholder="Add a model tag name"
bind:value={tagName}
required
/>
......@@ -447,12 +445,12 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
</div>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Description')}*</div>
<div class=" text-sm font-semibold mb-2">Description*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Add a short description about what this modelfile does')}
placeholder="Add a short description about what this modelfile does"
bind:value={desc}
required
/>
......@@ -461,7 +459,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
<div class="my-2">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-semibold">{$i18n.t('Modelfile')}</div>
<div class=" self-center text-sm font-semibold">Modelfile</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
......@@ -471,9 +469,9 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
}}
>
{#if raw}
<span class="ml-2 self-center"> {$i18n.t('Raw Format')} </span>
<span class="ml-2 self-center"> Raw Format </span>
{:else}
<span class="ml-2 self-center"> {$i18n.t('Builder Mode')} </span>
<span class="ml-2 self-center"> Builder Mode </span>
{/if}
</button>
</div>
......@@ -482,7 +480,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
{#if raw}
<div class="mt-2">
<div class=" text-xs font-semibold mb-2">{$i18n.t('Content')}*</div>
<div class=" text-xs font-semibold mb-2">Content*</div>
<div>
<textarea
......@@ -495,13 +493,12 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
</div>
<div class="text-xs text-gray-400 dark:text-gray-500">
{$i18n.t('Not sure what to write? Switch to')}
<button
Not sure what to write? Switch to <button
class="text-gray-500 dark:text-gray-300 font-medium cursor-pointer"
type="button"
on:click={() => {
raw = !raw;
}}>{$i18n.t('Builder Mode')}</button
}}>Builder Mode</button
>
or
<a
......@@ -509,13 +506,13 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
href="https://openwebui.com"
target="_blank"
>
{$i18n.t('Click here to check other modelfiles.')}
Click here to check other modelfiles.
</a>
</div>
</div>
{:else}
<div class="my-2">
<div class=" text-xs font-semibold mb-2">{$i18n.t('From (Base Model)')}*</div>
<div class=" text-xs font-semibold mb-2">From (Base Model)*</div>
<div>
<input
......@@ -527,17 +524,16 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
</div>
<div class="mt-1 text-xs text-gray-400 dark:text-gray-500">
{$i18n.t('To access the available model names for downloading,')}
<a
To access the available model names for downloading, <a
class=" text-gray-500 dark:text-gray-300 font-medium"
href="https://ollama.com/library"
target="_blank">{$i18n.t('click here.')}</a
target="_blank">click here.</a
>
</div>
</div>
<div class="my-1">
<div class=" text-xs font-semibold mb-2">{$i18n.t('System Prompt')}</div>
<div class=" text-xs font-semibold mb-2">System Prompt</div>
<div>
<textarea
......@@ -550,9 +546,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
</div>
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-semibold">
{$i18n.t('Modelfile Advanced Settings')}
</div>
<div class=" self-center text-sm font-semibold">Modelfile Advanced Settings</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
......@@ -562,16 +556,16 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
}}
>
{#if advanced}
<span class="ml-2 self-center">{$i18n.t('Custom')}</span>
<span class="ml-2 self-center"> Custom </span>
{:else}
<span class="ml-2 self-center">{$i18n.t('Default')}</span>
<span class="ml-2 self-center"> Default </span>
{/if}
</button>
</div>
{#if advanced}
<div class="my-2">
<div class=" text-xs font-semibold mb-2">{$i18n.t('Template')}</div>
<div class=" text-xs font-semibold mb-2">Template</div>
<div>
<textarea
......@@ -584,7 +578,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
</div>
<div class="my-2">
<div class=" text-xs font-semibold mb-2">{$i18n.t('Parameters')}</div>
<div class=" text-xs font-semibold mb-2">Parameters</div>
<div>
<AdvancedParams bind:options />
......@@ -596,7 +590,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
<div class="my-2">
<div class="flex w-full justify-between mb-2">
<div class=" self-center text-sm font-semibold">{$i18n.t('Prompt suggestions')}</div>
<div class=" self-center text-sm font-semibold">Prompt suggestions</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
......@@ -624,7 +618,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
<div class=" flex border dark:border-gray-600 rounded-lg">
<input
class="px-3 py-1.5 text-sm w-full bg-transparent outline-none border-r dark:border-gray-600"
placeholder={$i18n.t('Write a prompt suggestion (e.g. Who are you?)')}
placeholder="Write a prompt suggestion (e.g. Who are you?)"
bind:value={prompt.content}
/>
......@@ -653,7 +647,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
</div>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Categories')}</div>
<div class=" text-sm font-semibold mb-2">Categories</div>
<div class="grid grid-cols-4">
{#each Object.keys(categories) as category}
......@@ -667,7 +661,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
{#if pullProgress !== null}
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Pull Progress')}</div>
<div class=" text-sm font-semibold mb-2">Pull Progress</div>
<div class="w-full rounded-full dark:bg-gray-800">
<div
class="dark:bg-gray-600 bg-gray-500 text-xs font-medium text-gray-100 text-center p-0.5 leading-none rounded-full"
......@@ -690,7 +684,7 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
type="submit"
disabled={loading}
>
<div class=" self-center font-medium">{$i18n.t('Save & Create')}</div>
<div class=" self-center font-medium">Save & Create</div>
{#if loading}
<div class="ml-1.5 self-center">
......
src/routes/(app)/modelfiles/edit/+page.svelte
View file @ 099b1d06
......@@ -3,7 +3,7 @@
import { toast } from 'svelte-sonner';
import { goto } from '$app/navigation';
import { onMount, getContext } from 'svelte';
import { onMount } from 'svelte';
import { page } from '$app/stores';
import { settings, user, config, modelfiles } from '$lib/stores';
......@@ -14,8 +14,6 @@
import AdvancedParams from '$lib/components/chat/Settings/Advanced/AdvancedParams.svelte';
const i18n = getContext('i18n');
let loading = false;
let filesInputElement;
......@@ -250,7 +248,7 @@
}}
/>
<div class=" text-2xl font-semibold mb-6">{$i18n.t('My Modelfiles')}</div>
<div class=" text-2xl font-semibold mb-6">My Modelfiles</div>
<button
class="flex space-x-1"
......@@ -272,7 +270,7 @@
/>
</svg>
</div>
<div class=" self-center font-medium text-sm">{$i18n.t('Back')}</div>
<div class=" self-center font-medium text-sm">Back</div>
</button>
<hr class="my-3 dark:border-gray-700" />
......@@ -319,12 +317,12 @@
<div class="my-2 flex space-x-2">
<div class="flex-1">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Name')}*</div>
<div class=" text-sm font-semibold mb-2">Name*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Name your modelfile')}
placeholder="Name your modelfile"
bind:value={title}
required
/>
......@@ -332,12 +330,12 @@
</div>
<div class="flex-1">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Model Tag Name')}*</div>
<div class=" text-sm font-semibold mb-2">Model Tag Name*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent disabled:text-gray-500 border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Add a model tag name')}
placeholder="Add a model tag name"
value={tagName}
disabled
required
......@@ -347,12 +345,12 @@
</div>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Description')}*</div>
<div class=" text-sm font-semibold mb-2">Description*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Add a short description about what this modelfile does')}
placeholder="Add a short description about what this modelfile does"
bind:value={desc}
required
/>
......@@ -361,13 +359,13 @@
<div class="my-2">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-semibold">{$i18n.t('Modelfile')}</div>
<div class=" self-center text-sm font-semibold">Modelfile</div>
</div>
<!-- <div class=" text-sm font-semibold mb-2"></div> -->
<div class="mt-2">
<div class=" text-xs font-semibold mb-2">{$i18n.t('Content')}*</div>
<div class=" text-xs font-semibold mb-2">Content*</div>
<div>
<textarea
......@@ -383,7 +381,7 @@
<div class="my-2">
<div class="flex w-full justify-between mb-2">
<div class=" self-center text-sm font-semibold">{$i18n.t('Prompt suggestions')}</div>
<div class=" self-center text-sm font-semibold">Prompt suggestions</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
......@@ -411,7 +409,7 @@
<div class=" flex border dark:border-gray-600 rounded-lg">
<input
class="px-3 py-1.5 text-sm w-full bg-transparent outline-none border-r dark:border-gray-600"
placeholder={$i18n.t('Write a prompt suggestion (e.g. Who are you?)')}
placeholder="Write a prompt suggestion (e.g. Who are you?)"
bind:value={prompt.content}
/>
......@@ -440,7 +438,7 @@
</div>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Categories')}</div>
<div class=" text-sm font-semibold mb-2">Categories</div>
<div class="grid grid-cols-4">
{#each Object.keys(categories) as category}
......@@ -455,7 +453,7 @@
{#if pullProgress !== null}
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Pull Progress')}</div>
<div class=" text-sm font-semibold mb-2">Pull Progress</div>
<div class="w-full rounded-full dark:bg-gray-800">
<div
class="dark:bg-gray-600 text-xs font-medium text-blue-100 text-center p-0.5 leading-none rounded-full"
......@@ -478,7 +476,7 @@
type="submit"
disabled={loading}
>
<div class=" self-center font-medium">{$i18n.t('Save & Update')}</div>
<div class=" self-center font-medium">Save & Update</div>
{#if loading}
<div class="ml-1.5 self-center">
......
src/routes/(app)/playground/+page.svelte
View file @ 099b1d06
<script lang="ts">
import { goto } from '$app/navigation';
import { onMount, tick, getContext } from 'svelte';
import { onMount, tick } from 'svelte';
import { toast } from 'svelte-sonner';
......@@ -13,14 +13,11 @@
} from '$lib/constants';
import { WEBUI_NAME, config, user, models, settings } from '$lib/stores';
import { cancelOllamaRequest, generateChatCompletion } from '$lib/apis/ollama';
import { cancelChatCompletion, generateChatCompletion } from '$lib/apis/ollama';
import { generateOpenAIChatCompletion } from '$lib/apis/openai';
import { splitStream } from '$lib/utils';
import ChatCompletion from '$lib/components/playground/ChatCompletion.svelte';
import Selector from '$lib/components/chat/ModelSelector/Selector.svelte';
const i18n = getContext('i18n');
let mode = 'chat';
let loaded = false;
......@@ -53,7 +50,7 @@
// const cancelHandler = async () => {
// if (currentRequestId) {
// const res = await cancelOllamaRequest(localStorage.token, currentRequestId);
// const res = await cancelChatCompletion(localStorage.token, currentRequestId);
// currentRequestId = null;
// loading = false;
// }
......@@ -96,7 +93,7 @@
const { value, done } = await reader.read();
if (done || stopResponseFlag) {
if (stopResponseFlag) {
await cancelOllamaRequest(localStorage.token, currentRequestId);
await cancelChatCompletion(localStorage.token, currentRequestId);
}
currentRequestId = null;
......@@ -182,7 +179,7 @@
const { value, done } = await reader.read();
if (done || stopResponseFlag) {
if (stopResponseFlag) {
await cancelOllamaRequest(localStorage.token, currentRequestId);
await cancelChatCompletion(localStorage.token, currentRequestId);
}
currentRequestId = null;
......@@ -264,7 +261,7 @@
<svelte:head>
<title>
{$i18n.t('Playground')} | {$WEBUI_NAME}
{`Playground | ${$WEBUI_NAME}`}
</title>
</svelte:head>
......@@ -275,8 +272,7 @@
<div class="flex flex-col justify-between mb-2.5 gap-1">
<div class="flex justify-between items-center gap-2">
<div class=" text-2xl font-semibold self-center flex">
{$i18n.t('Playground')}
<span class=" text-xs text-gray-500 self-center ml-1">{$i18n.t('(Beta)')}</span>
Playground <span class=" text-xs text-gray-500 self-center ml-1">(Beta)</span>
</div>
<div>
......@@ -293,9 +289,9 @@
}}
>
{#if mode === 'complete'}
{$i18n.t('Text Completion')}
Text Completion
{:else if mode === 'chat'}
{$i18n.t('Chat')}
Chat
{/if}
<div>
......@@ -316,24 +312,25 @@
</div>
</div>
<div class="flex flex-col gap-1 px-1 w-full">
<div class="flex w-full">
<div class="overflow-hidden w-full">
<div class="max-w-full">
<Selector
placeholder={$i18n.t('Select a model')}
items={$models
.filter((model) => model.name !== 'hr')
.map((model) => ({
value: model.id,
label: model.name,
info: model
}))}
bind:value={selectedModelId}
/>
</div>
</div>
</div>
<div class=" flex gap-1 px-1">
<select
id="models"
class="outline-none bg-transparent text-sm font-medium rounded-lg w-full placeholder-gray-400"
bind:value={selectedModelId}
>
<option class=" text-gray-800" value="" selected disabled>Select a model</option>
{#each $models as model}
{#if model.name === 'hr'}
<hr />
{:else}
<option value={model.id} class="text-gray-800 text-lg"
>{model.name +
`${model.size ? ` (${(model.size / 1024 ** 3).toFixed(1)}GB)` : ''}`}</option
>
{/if}
{/each}
</select>
<!-- <button
class=" self-center dark:hover:text-gray-300"
......@@ -366,12 +363,12 @@
{#if mode === 'chat'}
<div class="p-1">
<div class="p-3 outline outline-1 outline-gray-200 dark:outline-gray-800 rounded-lg">
<div class=" text-sm font-medium">{$i18n.t('System')}</div>
<div class=" text-sm font-medium">System</div>
<textarea
id="system-textarea"
class="w-full h-full bg-transparent resize-none outline-none text-sm"
bind:value={system}
placeholder={$i18n.t("You're a helpful assistant.")}
placeholder="You're a helpful assistant."
rows="4"
/>
</div>
......@@ -391,7 +388,7 @@
bind:this={textCompletionAreaElement}
class="w-full h-full p-3 bg-transparent outline outline-1 outline-gray-200 dark:outline-gray-800 resize-none rounded-lg text-sm"
bind:value={text}
placeholder={$i18n.t("You're a helpful assistant.")}
placeholder="You're a helpful assistant."
/>
{:else if mode === 'chat'}
<ChatCompletion bind:messages />
......@@ -408,7 +405,7 @@
submitHandler();
}}
>
{$i18n.t('Submit')}
Submit
</button>
{:else}
<button
......@@ -417,7 +414,7 @@
stopResponse();
}}
>
{$i18n.t('Cancel')}
Cancel
</button>
{/if}
</div>
......
src/routes/(app)/prompts/+page.svelte
View file @ 099b1d06
......@@ -3,19 +3,17 @@
import fileSaver from 'file-saver';
const { saveAs } = fileSaver;
import { onMount, getContext } from 'svelte';
import { onMount } from 'svelte';
import { WEBUI_NAME, prompts } from '$lib/stores';
import { createNewPrompt, deletePromptByCommand, getPrompts } from '$lib/apis/prompts';
import { error } from '@sveltejs/kit';
import { goto } from '$app/navigation';
const i18n = getContext('i18n');
let importFiles = '';
let query = '';
let promptsImportInputElement: HTMLInputElement;
const sharePrompt = async (prompt) => {
toast.success($i18n.t('Redirecting you to OpenWebUI Community'));
toast.success('Redirecting you to OpenWebUI Community');
const url = 'https://openwebui.com';
......@@ -40,7 +38,7 @@
<svelte:head>
<title>
{$i18n.t('Prompts')} | {$WEBUI_NAME}
{`Prompts | ${$WEBUI_NAME}`}
</title>
</svelte:head>
......@@ -48,7 +46,7 @@
<div class="flex flex-col justify-between w-full overflow-y-auto">
<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
<div class="mb-6 flex justify-between items-center">
<div class=" text-2xl font-semibold self-center">{$i18n.t('My Prompts')}</div>
<div class=" text-2xl font-semibold self-center">My Prompts</div>
</div>
<div class=" flex w-full space-x-2">
......@@ -70,7 +68,7 @@
<input
class=" w-full text-sm pr-4 py-1 rounded-r-xl outline-none bg-transparent"
bind:value={query}
placeholder={$i18n.t('Search Prompts')}
placeholder="Search Prompt"
/>
</div>
......@@ -248,7 +246,7 @@
promptsImportInputElement.click();
}}
>
<div class=" self-center mr-2 font-medium">{$i18n.t('Import Prompts')}</div>
<div class=" self-center mr-2 font-medium">Import Prompts</div>
<div class=" self-center">
<svg
......@@ -276,7 +274,7 @@
saveAs(blob, `prompts-export-${Date.now()}.json`);
}}
>
<div class=" self-center mr-2 font-medium">{$i18n.t('Export Prompts')}</div>
<div class=" self-center mr-2 font-medium">Export Prompts</div>
<div class=" self-center">
<svg
......@@ -305,7 +303,7 @@
</div>
<div class=" my-16">
<div class=" text-2xl font-semibold mb-3">{$i18n.t('Made by OpenWebUI Community')}</div>
<div class=" text-2xl font-semibold mb-3">Made by OpenWebUI Community</div>
<a
class=" flex space-x-4 cursor-pointer w-full mb-3 px-3 py-2"
......@@ -332,8 +330,8 @@
</div>
<div class=" self-center">
<div class=" font-bold">{$i18n.t('Discover a prompt')}</div>
<div class=" text-sm">{$i18n.t('Discover, download, and explore custom prompts')}</div>
<div class=" font-bold">Discover a prompt</div>
<div class=" text-sm">Discover, download, and explore custom prompts</div>
</div>
</a>
</div>
......
src/routes/(app)/prompts/create/+page.svelte
View file @ 099b1d06
......@@ -3,12 +3,10 @@
import { goto } from '$app/navigation';
import { prompts } from '$lib/stores';
import { onMount, tick, getContext } from 'svelte';
import { onMount, tick } from 'svelte';
import { createNewPrompt, getPrompts } from '$lib/apis/prompts';
const i18n = getContext('i18n');
let loading = false;
// ///////////
......@@ -38,9 +36,7 @@
await goto('/prompts');
}
} else {
toast.error(
$i18n.t('Only alphanumeric characters and hyphens are allowed in the command string.')
);
toast.error('Only alphanumeric characters and hyphens are allowed in the command string.');
}
loading = false;
......@@ -96,7 +92,7 @@
<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
<div class=" flex flex-col justify-between w-full overflow-y-auto">
<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
<div class=" text-2xl font-semibold mb-6">{$i18n.t('My Prompts')}</div>
<div class=" text-2xl font-semibold mb-6">My Prompts</div>
<button
class="flex space-x-1"
......@@ -118,7 +114,7 @@
/>
</svg>
</div>
<div class=" self-center font-medium text-sm">{$i18n.t('Back')}</div>
<div class=" self-center font-medium text-sm">Back</div>
</button>
<hr class="my-3 dark:border-gray-700" />
......@@ -129,12 +125,12 @@
}}
>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Title')}*</div>
<div class=" text-sm font-semibold mb-2">Title*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Add a short title for this prompt')}
placeholder="Add a short title for this prompt"
bind:value={title}
required
/>
......@@ -142,7 +138,7 @@
</div>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Command')}*</div>
<div class=" text-sm font-semibold mb-2">Command*</div>
<div class="flex items-center mb-1">
<div
......@@ -152,38 +148,34 @@
</div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-r-lg"
placeholder={$i18n.t('short-summary')}
placeholder="short-summary"
bind:value={command}
required
/>
</div>
<div class="text-xs text-gray-400 dark:text-gray-500">
{$i18n.t('Only')}
<span class=" text-gray-600 dark:text-gray-300 font-medium"
>{$i18n.t('alphanumeric characters and hyphens')}</span
Only <span class=" text-gray-600 dark:text-gray-300 font-medium"
>alphanumeric characters and hyphens</span
>
{$i18n.t('are allowed - Activate this command by typing')}&nbsp;"<span
are allowed; Activate this command by typing "<span
class=" text-gray-600 dark:text-gray-300 font-medium"
>
/{command}
</span>" &nbsp;
{$i18n.t('to chat input.')}
</span>" to chat input.
</div>
</div>
<div class="my-2">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-semibold">{$i18n.t('Prompt Content')}*</div>
<div class=" self-center text-sm font-semibold">Prompt Content*</div>
</div>
<div class="mt-2">
<div>
<textarea
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t(
'Write a summary in 50 words that summarizes [topic or keyword].'
)}
placeholder={`Write a summary in 50 words that summarizes [topic or keyword].`}
rows="6"
bind:value={content}
required
......@@ -191,20 +183,18 @@
</div>
<div class="text-xs text-gray-400 dark:text-gray-500">
ⓘ {$i18n.t('Format your variables using square brackets like this:')}&nbsp;<span
class=" text-gray-600 dark:text-gray-300 font-medium">[{$i18n.t('variable')}]</span
>.
{$i18n.t('Make sure to enclose them with')}
ⓘ Format your variables using square brackets like this: <span
class=" text-gray-600 dark:text-gray-300 font-medium">[variable]</span
>
. Make sure to enclose them with
<span class=" text-gray-600 dark:text-gray-300 font-medium">'['</span>
{$i18n.t('and')}
<span class=" text-gray-600 dark:text-gray-300 font-medium">']'</span>.
and <span class=" text-gray-600 dark:text-gray-300 font-medium">']'</span>.
</div>
<div class="text-xs text-gray-400 dark:text-gray-500">
{$i18n.t('Utilize')}<span class=" text-gray-600 dark:text-gray-300 font-medium">
{` {{CLIPBOARD}}`}</span
>
{$i18n.t('variable to have them replaced with clipboard content.')}
Utilize <span class=" text-gray-600 dark:text-gray-300 font-medium"
>{`{{CLIPBOARD}}`}</span
> variable to have them replaced with clipboard content.
</div>
</div>
</div>
......@@ -217,7 +207,7 @@
type="submit"
disabled={loading}
>
<div class=" self-center font-medium">{$i18n.t('Save & Create')}</div>
<div class=" self-center font-medium">Save & Create</div>
{#if loading}
<div class="ml-1.5 self-center">
......
src/routes/(app)/prompts/edit/+page.svelte
View file @ 099b1d06
......@@ -3,9 +3,7 @@
import { goto } from '$app/navigation';
import { prompts } from '$lib/stores';
import { onMount, tick, getContext } from 'svelte';
const i18n = getContext('i18n');
import { onMount, tick } from 'svelte';
import { getPrompts, updatePromptByCommand } from '$lib/apis/prompts';
import { page } from '$app/stores';
......@@ -36,9 +34,7 @@
await goto('/prompts');
}
} else {
toast.error(
$i18n.t('Only alphanumeric characters and hyphens are allowed in the command string.')
);
toast.error('Only alphanumeric characters and hyphens are allowed in the command string.');
}
loading = false;
......@@ -78,7 +74,7 @@
<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
<div class="flex flex-col justify-between w-full overflow-y-auto">
<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
<div class=" text-2xl font-semibold mb-6">{$i18n.t('My Prompts')}</div>
<div class=" text-2xl font-semibold mb-6">My Prompts</div>
<button
class="flex space-x-1"
......@@ -100,7 +96,7 @@
/>
</svg>
</div>
<div class=" self-center font-medium text-sm">{$i18n.t('Back')}</div>
<div class=" self-center font-medium text-sm">Back</div>
</button>
<hr class="my-3 dark:border-gray-700" />
......@@ -111,12 +107,12 @@
}}
>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Title')}*</div>
<div class=" text-sm font-semibold mb-2">Title*</div>
<div>
<input
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t('Add a short title for this prompt')}
placeholder="Add a short title for this prompt"
bind:value={title}
required
/>
......@@ -124,7 +120,7 @@
</div>
<div class="my-2">
<div class=" text-sm font-semibold mb-2">{$i18n.t('Command')}*</div>
<div class=" text-sm font-semibold mb-2">Command*</div>
<div class="flex items-center mb-1">
<div
......@@ -142,31 +138,27 @@
</div>
<div class="text-xs text-gray-400 dark:text-gray-500">
{$i18n.t('Only')}
<span class=" text-gray-600 dark:text-gray-300 font-medium"
>{$i18n.t('alphanumeric characters and hyphens')}</span
Only <span class=" text-gray-600 dark:text-gray-300 font-medium"
>alphanumeric characters and hyphens</span
>
{$i18n.t('are allowed - Activate this command by typing')}&nbsp;"<span
are allowed; Activate this command by typing "<span
class=" text-gray-600 dark:text-gray-300 font-medium"
>
/{command}
</span>" &nbsp;
{$i18n.t('to chat input.')}
</span>" to chat input.
</div>
</div>
<div class="my-2">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-semibold">{$i18n.t('Prompt Content')}*</div>
<div class=" self-center text-sm font-semibold">Prompt Content*</div>
</div>
<div class="mt-2">
<div>
<textarea
class="px-3 py-1.5 text-sm w-full bg-transparent border dark:border-gray-600 outline-none rounded-lg"
placeholder={$i18n.t(
`Write a summary in 50 words that summarizes [topic or keyword].`
)}
placeholder={`Write a summary in 50 words that summarizes [topic or keyword].`}
rows="6"
bind:value={content}
required
......@@ -174,20 +166,12 @@
</div>
<div class="text-xs text-gray-400 dark:text-gray-500">
ⓘ {$i18n.t('Format your variables using square brackets like this:')}&nbsp;<span
class=" text-gray-600 dark:text-gray-300 font-medium">[{$i18n.t('variable')}]</span
>.
{$i18n.t('Make sure to enclose them with')}
<span class=" text-gray-600 dark:text-gray-300 font-medium">'['</span>
{$i18n.t('and')}
<span class=" text-gray-600 dark:text-gray-300 font-medium">']'</span>.
</div>
<div class="text-xs text-gray-400 dark:text-gray-500">
{$i18n.t('Utilize')}<span class=" text-gray-600 dark:text-gray-300 font-medium">
{` {{CLIPBOARD}}`}</span
Format your variables using square brackets like this: <span
class=" text-gray-600 dark:text-gray-300 font-medium">[variable]</span
>
{$i18n.t('variable to have them replaced with clipboard content.')}
. Make sure to enclose them with
<span class=" text-gray-600 dark:text-gray-300 font-medium">'['</span>
and <span class=" text-gray-600 dark:text-gray-300 font-medium">']'</span> .
</div>
</div>
</div>
......@@ -200,7 +184,7 @@
type="submit"
disabled={loading}
>
<div class=" self-center font-medium">{$i18n.t('Save & Update')}</div>
<div class=" self-center font-medium">Save & Update</div>
{#if loading}
<div class="ml-1.5 self-center">
......
src/routes/+layout.svelte
View file @ 099b1d06
<script>
import { onMount, tick, setContext } from 'svelte';
import { onMount, tick } from 'svelte';
import { config, user, theme, WEBUI_NAME } from '$lib/stores';
import { goto } from '$app/navigation';
import { Toaster, toast } from 'svelte-sonner';
......@@ -11,9 +11,6 @@
import '../tailwind.css';
import 'tippy.js/dist/tippy.css';
import { WEBUI_BASE_URL } from '$lib/constants';
import i18n, { initI18n } from '$lib/i18n';
setContext('i18n', i18n);
let loaded = false;
......@@ -25,11 +22,6 @@
if (backendConfig) {
// Save Backend Status to Store
await config.set(backendConfig);
if ($config.default_locale) {
initI18n($config.default_locale);
} else {
initI18n();
}
await WEBUI_NAME.set(backendConfig.name);
console.log(backendConfig);
......
src/routes/auth/+page.svelte
View file @ 099b1d06
......@@ -3,11 +3,9 @@
import { userSignIn, userSignUp } from '$lib/apis/auths';
import { WEBUI_API_BASE_URL, WEBUI_BASE_URL } from '$lib/constants';
import { WEBUI_NAME, config, user } from '$lib/stores';
import { onMount, getContext } from 'svelte';
import { onMount } from 'svelte';
import { toast } from 'svelte-sonner';
const i18n = getContext('i18n');
let loaded = false;
let mode = 'signin';
......@@ -18,7 +16,7 @@
const setSessionUser = async (sessionUser) => {
if (sessionUser) {
console.log(sessionUser);
toast.success($i18n.t(`You're now logged in.`));
toast.success(`You're now logged in.`);
localStorage.token = sessionUser.token;
await user.set(sessionUser);
goto('/');
......@@ -98,30 +96,26 @@
}}
>
<div class=" text-xl sm:text-2xl font-bold">
{mode === 'signin' ? $i18n.t('Sign in') : $i18n.t('Sign up')}
{$i18n.t('to')}
{$WEBUI_NAME}
{mode === 'signin' ? 'Sign in' : 'Sign up'} to {$WEBUI_NAME}
</div>
{#if mode === 'signup'}
<div class=" mt-1 text-xs font-medium text-gray-500">
ⓘ {$WEBUI_NAME}
{$i18n.t(
'does not make any external connections, and your data stays securely on your locally hosted server.'
)}
ⓘ {$WEBUI_NAME} does not make any external connections, and your data stays securely on
your locally hosted server.
</div>
{/if}
<div class="flex flex-col mt-4">
{#if mode === 'signup'}
<div>
<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Name')}</div>
<div class=" text-sm font-semibold text-left mb-1">Name</div>
<input
bind:value={name}
type="text"
class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
autocomplete="name"
placeholder={$i18n.t('Enter Your Full Name')}
placeholder="Enter Your Full Name"
required
/>
</div>
......@@ -130,24 +124,24 @@
{/if}
<div class="mb-2">
<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Email')}</div>
<div class=" text-sm font-semibold text-left mb-1">Email</div>
<input
bind:value={email}
type="email"
class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
autocomplete="email"
placeholder={$i18n.t('Enter Your Email')}
placeholder="Enter Your Email"
required
/>
</div>
<div>
<div class=" text-sm font-semibold text-left mb-1">{$i18n.t('Password')}</div>
<div class=" text-sm font-semibold text-left mb-1">Password</div>
<input
bind:value={password}
type="password"
class=" border px-4 py-2.5 rounded-2xl w-full text-sm"
placeholder={$i18n.t('Enter Your Password')}
placeholder="Enter Your Password"
autocomplete="current-password"
required
/>
......@@ -159,13 +153,11 @@
class=" bg-gray-900 hover:bg-gray-800 w-full rounded-full text-white font-semibold text-sm py-3 transition"
type="submit"
>
{mode === 'signin' ? $i18n.t('Sign in') : $i18n.t('Create Account')}
{mode === 'signin' ? 'Sign In' : 'Create Account'}
</button>
<div class=" mt-4 text-sm text-center">
{mode === 'signin'
? $i18n.t("Don't have an account?")
: $i18n.t('Already have an account?')}
{mode === 'signin' ? `Don't have an account?` : `Already have an account?`}
<button
class=" font-medium underline"
......@@ -178,7 +170,7 @@
}
}}
>
{mode === 'signin' ? $i18n.t('Sign up') : $i18n.t('Sign in')}
{mode === 'signin' ? `Sign up` : `Sign In`}
</button>
</div>
</div>
......
src/routes/error/+page.svelte
View file @ 099b1d06
<script>
import { goto } from '$app/navigation';
import { WEBUI_NAME, config } from '$lib/stores';
import { onMount, getContext } from 'svelte';
const i18n = getContext('i18n');
import { onMount } from 'svelte';
let loaded = false;
......@@ -21,25 +19,22 @@
<div class="absolute rounded-xl w-full h-full backdrop-blur flex justify-center">
<div class="m-auto pb-44 flex flex-col justify-center">
<div class="max-w-md">
<div class="text-center text-2xl font-medium z-50">
{$i18n.t('{{webUIName}} Backend Required', { webUIName: $WEBUI_NAME })}
</div>
<div class="text-center text-2xl font-medium z-50">{$WEBUI_NAME} Backend Required</div>
<div class=" mt-4 text-center text-sm w-full">
{$i18n.t(
"Oops! You're using an unsupported method (frontend only). Please serve the WebUI from the backend."
)}
Oops! You're using an unsupported method (frontend only). Please serve the WebUI from
the backend.
<br class=" " />
<br class=" " />
<a
class=" font-semibold underline"
href="https://github.com/open-webui/open-webui#how-to-install-"
target="_blank">{$i18n.t('See readme.md for instructions')}</a
target="_blank">See readme.md for instructions</a
>
{$i18n.t('or')}
or
<a class=" font-semibold underline" href="https://discord.gg/5rJgQTnV4s" target="_blank"
>{$i18n.t('join our Discord for help.')}</a
>join our Discord for help.</a
>
</div>
......@@ -50,7 +45,7 @@
location.href = '/';
}}
>
{$i18n.t('Check Again')}
Check Again
</button>
</div>
</div>
......
src/tailwind.css
View file @ 099b1d06
......@@ -3,14 +3,16 @@
@tailwind utilities;
@layer base {
html,
pre {
html {
font-family: -apple-system, 'Arimo', ui-sans-serif, system-ui, 'Segoe UI', Roboto, Ubuntu,
Cantarell, 'Noto Sans', sans-serif, 'Helvetica Neue', Arial, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
}
pre {
font-family: -apple-system, 'Arimo', ui-sans-serif, system-ui, 'Segoe UI', Roboto, Ubuntu,
Cantarell, 'Noto Sans', sans-serif, 'Helvetica Neue', Arial, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
white-space: pre-wrap;
}
}
static/manifest.json
View file @ 099b1d06
......@@ -13,4 +13,4 @@
"sizes": "844x884"
}
]
}
}
\ No newline at end of file
svelte.config.js
View file @ 099b1d06
......@@ -16,12 +16,6 @@ const config = {
assets: 'build',
fallback: 'index.html'
})
},
onwarn: (warning, handler) => {
const { code, _ } = warning;
if (code === 'css-unused-selector') return;
handler(warning);
}
};
......
tailwind.config.js
View file @ 099b1d06
......@@ -16,8 +16,9 @@ export default {
700: '#4e4e4e',
800: '#333',
850: '#262626',
900: 'var(--color-gray-900, #171717)',
950: 'var(--color-gray-950, #0d0d0d)'
900: '#171717',
950: '#0d0d0d'
}
},
typography: {
......
test.json 0 → 100644
View file @ 099b1d06
{
"model_name": "string",
"litellm_params": {
"model": "ollama/mistral"
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment