Skip to content

GitLab

Unverified Commit 8df0429c authored by Timothy Jaeryang Baek's avatar Timothy Jaeryang Baek Committed by GitHub
Browse files

Merge branch 'dev' into feat/model-config

parents f21c8626 59602eea
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 104 deletions
src/lib/components/chat/Settings/Connections.svelte
View file @ 8df0429c
...@@ -3,7 +3,13 @@ ...@@ -3,7 +3,13 @@
import { createEventDispatcher, onMount, getContext } from 'svelte'; import { createEventDispatcher, onMount, getContext } from 'svelte';
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
import { getOllamaUrls, getOllamaVersion, updateOllamaUrls } from '$lib/apis/ollama'; import {
getOllamaConfig,
getOllamaUrls,
getOllamaVersion,
updateOllamaConfig,
updateOllamaUrls
} from '$lib/apis/ollama';
import { import {
getOpenAIConfig, getOpenAIConfig,
getOpenAIKeys, getOpenAIKeys,
...@@ -26,6 +32,7 @@ ...@@ -26,6 +32,7 @@
let OPENAI_API_BASE_URLS = ['']; let OPENAI_API_BASE_URLS = [''];
let ENABLE_OPENAI_API = false; let ENABLE_OPENAI_API = false;
let ENABLE_OLLAMA_API = false;
const updateOpenAIHandler = async () => { const updateOpenAIHandler = async () => {
OPENAI_API_BASE_URLS = await updateOpenAIUrls(localStorage.token, OPENAI_API_BASE_URLS); OPENAI_API_BASE_URLS = await updateOpenAIUrls(localStorage.token, OPENAI_API_BASE_URLS);
...@@ -50,10 +57,13 @@ ...@@ -50,10 +57,13 @@
onMount(async () => { onMount(async () => {
if ($user.role === 'admin') { if ($user.role === 'admin') {
OLLAMA_BASE_URLS = await getOllamaUrls(localStorage.token); const ollamaConfig = await getOllamaConfig(localStorage.token);
const openaiConfig = await getOpenAIConfig(localStorage.token);
const config = await getOpenAIConfig(localStorage.token); ENABLE_OPENAI_API = openaiConfig.ENABLE_OPENAI_API;
ENABLE_OPENAI_API = config.ENABLE_OPENAI_API; ENABLE_OLLAMA_API = ollamaConfig.ENABLE_OLLAMA_API;
OLLAMA_BASE_URLS = await getOllamaUrls(localStorage.token);
OPENAI_API_BASE_URLS = await getOpenAIUrls(localStorage.token); OPENAI_API_BASE_URLS = await getOpenAIUrls(localStorage.token);
OPENAI_API_KEYS = await getOpenAIKeys(localStorage.token); OPENAI_API_KEYS = await getOpenAIKeys(localStorage.token);
...@@ -161,95 +171,108 @@ ...@@ -161,95 +171,108 @@
<hr class=" dark:border-gray-700" /> <hr class=" dark:border-gray-700" />
<div> <div class="pr-1.5 space-y-2">
<div class=" mb-2.5 text-sm font-medium">{$i18n.t('Ollama Base URL')}</div> <div class="flex justify-between items-center text-sm">
<div class="flex w-full gap-1.5"> <div class=" font-medium">{$i18n.t('Ollama API')}</div>
<div class="flex-1 flex flex-col gap-2">
{#each OLLAMA_BASE_URLS as url, idx} <div class="mt-1">
<div class="flex gap-1.5"> <Switch
<input bind:state={ENABLE_OLLAMA_API}
class="w-full rounded-lg py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-850 outline-none" on:change={async () => {
placeholder={$i18n.t('Enter URL (e.g. http://localhost:11434)')} updateOllamaConfig(localStorage.token, ENABLE_OLLAMA_API);
bind:value={url} }}
/> />
</div>
</div>
{#if ENABLE_OLLAMA_API}
<div class="flex w-full gap-1.5">
<div class="flex-1 flex flex-col gap-2">
{#each OLLAMA_BASE_URLS as url, idx}
<div class="flex gap-1.5">
<input
class="w-full rounded-lg py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-850 outline-none"
placeholder={$i18n.t('Enter URL (e.g. http://localhost:11434)')}
bind:value={url}
/>
<div class="self-center flex items-center"> <div class="self-center flex items-center">
{#if idx === 0} {#if idx === 0}
<button <button
class="px-1" class="px-1"
on:click={() => { on:click={() => {
OLLAMA_BASE_URLS = [...OLLAMA_BASE_URLS, '']; OLLAMA_BASE_URLS = [...OLLAMA_BASE_URLS, ''];
}} }}
type="button" type="button"
>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 16 16"
fill="currentColor"
class="w-4 h-4"
> >
<path <svg
d="M8.75 3.75a.75.75 0 0 0-1.5 0v3.5h-3.5a.75.75 0 0 0 0 1.5h3.5v3.5a.75.75 0 0 0 1.5 0v-3.5h3.5a.75.75 0 0 0 0-1.5h-3.5v-3.5Z" xmlns="http://www.w3.org/2000/svg"
/> viewBox="0 0 16 16"
</svg> fill="currentColor"
</button> class="w-4 h-4"
{:else} >
<button <path
class="px-1" d="M8.75 3.75a.75.75 0 0 0-1.5 0v3.5h-3.5a.75.75 0 0 0 0 1.5h3.5v3.5a.75.75 0 0 0 1.5 0v-3.5h3.5a.75.75 0 0 0 0-1.5h-3.5v-3.5Z"
on:click={() => { />
OLLAMA_BASE_URLS = OLLAMA_BASE_URLS.filter((url, urlIdx) => idx !== urlIdx); </svg>
}} </button>
type="button" {:else}
> <button
<svg class="px-1"
xmlns="http://www.w3.org/2000/svg" on:click={() => {
viewBox="0 0 16 16" OLLAMA_BASE_URLS = OLLAMA_BASE_URLS.filter((url, urlIdx) => idx !== urlIdx);
fill="currentColor" }}
class="w-4 h-4" type="button"
> >
<path d="M3.75 7.25a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Z" /> <svg
</svg> xmlns="http://www.w3.org/2000/svg"
</button> viewBox="0 0 16 16"
{/if} fill="currentColor"
class="w-4 h-4"
>
<path d="M3.75 7.25a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Z" />
</svg>
</button>
{/if}
</div>
</div> </div>
</div> {/each}
{/each} </div>
</div>
<div class=""> <div class="flex">
<button <button
class="p-2.5 bg-gray-200 hover:bg-gray-300 dark:bg-gray-850 dark:hover:bg-gray-800 rounded-lg transition" class="self-center p-2 bg-gray-200 hover:bg-gray-300 dark:bg-gray-900 dark:hover:bg-gray-850 rounded-lg transition"
on:click={() => { on:click={() => {
updateOllamaUrlsHandler(); updateOllamaUrlsHandler();
}} }}
type="button" type="button"
>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
class="w-4 h-4"
> >
<path <svg
fill-rule="evenodd" xmlns="http://www.w3.org/2000/svg"
d="M15.312 11.424a5.5 5.5 0 01-9.201 2.466l-.312-.311h2.433a.75.75 0 000-1.5H3.989a.75.75 0 00-.75.75v4.242a.75.75 0 001.5 0v-2.43l.31.31a7 7 0 0011.712-3.138.75.75 0 00-1.449-.39zm1.23-3.723a.75.75 0 00.219-.53V2.929a.75.75 0 00-1.5 0V5.36l-.31-.31A7 7 0 003.239 8.188a.75.75 0 101.448.389A5.5 5.5 0 0113.89 6.11l.311.31h-2.432a.75.75 0 000 1.5h4.243a.75.75 0 00.53-.219z" viewBox="0 0 20 20"
clip-rule="evenodd" fill="currentColor"
/> class="w-4 h-4"
</svg> >
</button> <path
fill-rule="evenodd"
d="M15.312 11.424a5.5 5.5 0 01-9.201 2.466l-.312-.311h2.433a.75.75 0 000-1.5H3.989a.75.75 0 00-.75.75v4.242a.75.75 0 001.5 0v-2.43l.31.31a7 7 0 0011.712-3.138.75.75 0 00-1.449-.39zm1.23-3.723a.75.75 0 00.219-.53V2.929a.75.75 0 00-1.5 0V5.36l-.31-.31A7 7 0 003.239 8.188a.75.75 0 101.448.389A5.5 5.5 0 0113.89 6.11l.311.31h-2.432a.75.75 0 000 1.5h4.243a.75.75 0 00.53-.219z"
clip-rule="evenodd"
/>
</svg>
</button>
</div>
</div> </div>
</div>
<div class="mt-2 text-xs text-gray-400 dark:text-gray-500"> <div class="mt-2 text-xs text-gray-400 dark:text-gray-500">
{$i18n.t('Trouble accessing Ollama?')} {$i18n.t('Trouble accessing Ollama?')}
<a <a
class=" text-gray-300 font-medium underline" class=" text-gray-300 font-medium underline"
href="https://github.com/open-webui/open-webui#troubleshooting" href="https://github.com/open-webui/open-webui#troubleshooting"
target="_blank" target="_blank"
> >
{$i18n.t('Click here for help.')} {$i18n.t('Click here for help.')}
</a> </a>
</div> </div>
{/if}
</div> </div>
</div> </div>
......
src/lib/i18n/locales/ar-BH/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "حسنا دعنا نذهب!", "Okay, Let's Go!": "حسنا دعنا نذهب!",
"OLED Dark": "OLED داكن", "OLED Dark": "OLED داكن",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama الرابط الافتراضي", "Ollama API": "",
"Ollama Version": "Ollama الاصدار", "Ollama Version": "Ollama الاصدار",
"On": "تشغيل", "On": "تشغيل",
"Only": "فقط", "Only": "فقط",
......
src/lib/i18n/locales/bg-BG/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "ОК, Нека започваме!", "Okay, Let's Go!": "ОК, Нека започваме!",
"OLED Dark": "OLED тъмно", "OLED Dark": "OLED тъмно",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama Базов URL", "Ollama API": "",
"Ollama Version": "Ollama Версия", "Ollama Version": "Ollama Версия",
"On": "Вкл.", "On": "Вкл.",
"Only": "Само", "Only": "Само",
......
src/lib/i18n/locales/bn-BD/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "ঠিক আছে, চলুন যাই!", "Okay, Let's Go!": "ঠিক আছে, চলুন যাই!",
"OLED Dark": "OLED ডার্ক", "OLED Dark": "OLED ডার্ক",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama বেজ ইউআরএল", "Ollama API": "",
"Ollama Version": "Ollama ভার্সন", "Ollama Version": "Ollama ভার্সন",
"On": "চালু", "On": "চালু",
"Only": "শুধুমাত্র", "Only": "শুধুমাত্র",
......
src/lib/i18n/locales/ca-ES/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "D'acord, Anem!", "Okay, Let's Go!": "D'acord, Anem!",
"OLED Dark": "OLED Fosc", "OLED Dark": "OLED Fosc",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "URL Base d'Ollama", "Ollama API": "",
"Ollama Version": "Versió d'Ollama", "Ollama Version": "Versió d'Ollama",
"On": "Activat", "On": "Activat",
"Only": "Només", "Only": "Només",
......
src/lib/i18n/locales/de-DE/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "Okay, los geht's!", "Okay, Let's Go!": "Okay, los geht's!",
"OLED Dark": "OLED Dunkel", "OLED Dark": "OLED Dunkel",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama Basis URL", "Ollama API": "",
"Ollama Version": "Ollama-Version", "Ollama Version": "Ollama-Version",
"On": "Ein", "On": "Ein",
"Only": "Nur", "Only": "Nur",
......
src/lib/i18n/locales/dg-DG/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "Okay, Let's Go!", "Okay, Let's Go!": "Okay, Let's Go!",
"OLED Dark": "OLED Dark", "OLED Dark": "OLED Dark",
"Ollama": "", "Ollama": "",
"Ollama Base URL": "Ollama Base Bark", "Ollama API": "",
"Ollama Version": "Ollama Version", "Ollama Version": "Ollama Version",
"On": "On", "On": "On",
"Only": "Only", "Only": "Only",
......
src/lib/i18n/locales/en-GB/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "", "Okay, Let's Go!": "",
"OLED Dark": "", "OLED Dark": "",
"Ollama": "", "Ollama": "",
"Ollama Base URL": "", "Ollama API": "",
"Ollama Version": "", "Ollama Version": "",
"On": "", "On": "",
"Only": "", "Only": "",
......
src/lib/i18n/locales/en-US/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "", "Okay, Let's Go!": "",
"OLED Dark": "", "OLED Dark": "",
"Ollama": "", "Ollama": "",
"Ollama Base URL": "", "Ollama API": "",
"Ollama Version": "", "Ollama Version": "",
"On": "", "On": "",
"Only": "", "Only": "",
......
src/lib/i18n/locales/es-ES/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "Bien, ¡Vamos!", "Okay, Let's Go!": "Bien, ¡Vamos!",
"OLED Dark": "OLED oscuro", "OLED Dark": "OLED oscuro",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "URL base de Ollama", "Ollama API": "",
"Ollama Version": "Versión de Ollama", "Ollama Version": "Versión de Ollama",
"On": "Activado", "On": "Activado",
"Only": "Solamente", "Only": "Solamente",
......
src/lib/i18n/locales/fa-IR/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "باشه، بزن بریم!", "Okay, Let's Go!": "باشه، بزن بریم!",
"OLED Dark": "OLED تیره", "OLED Dark": "OLED تیره",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "URL پایه اولاما", "Ollama API": "",
"Ollama Version": "نسخه اولاما", "Ollama Version": "نسخه اولاما",
"On": "روشن", "On": "روشن",
"Only": "فقط", "Only": "فقط",
......
src/lib/i18n/locales/fi-FI/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "Eikun menoksi!", "Okay, Let's Go!": "Eikun menoksi!",
"OLED Dark": "OLED-tumma", "OLED Dark": "OLED-tumma",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama-perus-URL", "Ollama API": "",
"Ollama Version": "Ollama-versio", "Ollama Version": "Ollama-versio",
"On": "Päällä", "On": "Päällä",
"Only": "Vain", "Only": "Vain",
......
src/lib/i18n/locales/fr-CA/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "Okay, Allons-y !", "Okay, Let's Go!": "Okay, Allons-y !",
"OLED Dark": "OLED Sombre", "OLED Dark": "OLED Sombre",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "URL de Base Ollama", "Ollama API": "",
"Ollama Version": "Version Ollama", "Ollama Version": "Version Ollama",
"On": "Activé", "On": "Activé",
"Only": "Seulement", "Only": "Seulement",
......
src/lib/i18n/locales/fr-FR/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "D'accord, allons-y !", "Okay, Let's Go!": "D'accord, allons-y !",
"OLED Dark": "OLED Sombre", "OLED Dark": "OLED Sombre",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "URL de Base Ollama", "Ollama API": "",
"Ollama Version": "Version Ollama", "Ollama Version": "Version Ollama",
"On": "Activé", "On": "Activé",
"Only": "Seulement", "Only": "Seulement",
......
src/lib/i18n/locales/he-IL/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "בסדר, בואו נתחיל!", "Okay, Let's Go!": "בסדר, בואו נתחיל!",
"OLED Dark": "OLED כהה", "OLED Dark": "OLED כהה",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "כתובת URL בסיסית של Ollama", "Ollama API": "",
"Ollama Version": "גרסת Ollama", "Ollama Version": "גרסת Ollama",
"On": "פועל", "On": "פועל",
"Only": "רק", "Only": "רק",
......
src/lib/i18n/locales/hi-IN/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "ठीक है, चलिए चलते हैं!", "Okay, Let's Go!": "ठीक है, चलिए चलते हैं!",
"OLED Dark": "OLEDescuro", "OLED Dark": "OLEDescuro",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama URL", "Ollama API": "",
"Ollama Version": "Ollama Version", "Ollama Version": "Ollama Version",
"On": "चालू", "On": "चालू",
"Only": "केवल", "Only": "केवल",
......
src/lib/i18n/locales/hr-HR/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "U redu, idemo!", "Okay, Let's Go!": "U redu, idemo!",
"OLED Dark": "OLED Tamno", "OLED Dark": "OLED Tamno",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Osnovni URL Ollama", "Ollama API": "",
"Ollama Version": "Verzija Ollama", "Ollama Version": "Verzija Ollama",
"On": "Uključeno", "On": "Uključeno",
"Only": "Samo", "Only": "Samo",
......
src/lib/i18n/locales/it-IT/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "Ok, andiamo!", "Okay, Let's Go!": "Ok, andiamo!",
"OLED Dark": "OLED scuro", "OLED Dark": "OLED scuro",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "URL base Ollama", "Ollama API": "",
"Ollama Version": "Versione Ollama", "Ollama Version": "Versione Ollama",
"On": "Attivato", "On": "Attivato",
"Only": "Solo", "Only": "Solo",
......
src/lib/i18n/locales/ja-JP/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "OK、始めましょう！", "Okay, Let's Go!": "OK、始めましょう！",
"OLED Dark": "OLED ダーク", "OLED Dark": "OLED ダーク",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama ベース URL", "Ollama API": "",
"Ollama Version": "Ollama バージョン", "Ollama Version": "Ollama バージョン",
"On": "オン", "On": "オン",
"Only": "のみ", "Only": "のみ",
......
src/lib/i18n/locales/ka-GE/translation.json
View file @ 8df0429c
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"Okay, Let's Go!": "კარგი, წავედით!", "Okay, Let's Go!": "კარგი, წავედით!",
"OLED Dark": "OLED მუქი", "OLED Dark": "OLED მუქი",
"Ollama": "Ollama", "Ollama": "Ollama",
"Ollama Base URL": "Ollama ბაზისური მისამართი", "Ollama API": "",
"Ollama Version": "Ollama ვერსია", "Ollama Version": "Ollama ვერსია",
"On": "ჩართვა", "On": "ჩართვა",
"Only": "მხოლოდ", "Only": "მხოლოდ",
......
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