UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-25 21:38:43 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #70 from ollama-webui/dev

Browse Source 
fix: ollama custom url support
This commit is contained in:
Timothy Jaeryang Baek 2023-11-06 04:14:31 -05:00 committed by GitHub
commit 9a6919331a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/components/chat/SettingsModal.svelte
View File

@ -65,7 +65,7 @@
if (API_BASE_URL === '') {
API_BASE_URL = BUILD_TIME_API_BASE_URL;
}
const res = await getModelTags(API_BASE_URL);
const res = await getModelTags(API_BASE_URL, 'ollama');
if (res) {
toast.success('Server connection verified');
@ -774,7 +774,7 @@
<div>
<a href="https://github.com/ollama-webui/ollama-webui">
<img
alt="followers"
alt="Github Repo"
src="https://img.shields.io/github/stars/ollama-webui/ollama-webui?style=social&label=Star us on Github"
/>
</a>

67
src/routes/+page.svelte
View File

@ -236,6 +236,7 @@
console.log(updated);
settings = { ...settings, ...updated };
localStorage.setItem('settings', JSON.stringify(settings));
API_BASE_URL = updated?.API_BASE_URL ?? API_BASE_URL;
await getModelTags();
};
@ -374,7 +375,7 @@
// Ollama functions
//////////////////////////
const getModelTags = async (url = null) => {
const getModelTags = async (url = null, type = 'all') => {
const res = await fetch(`${url === null ? API_BASE_URL : url}/tags`, {
method: 'GET',
headers: {
@ -394,43 +395,47 @@
console.log(res);
if (settings.OPENAI_API_KEY) {
// Validate OPENAI_API_KEY
const openaiModelRes = await fetch(`https://api.openai.com/v1/models`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${settings.OPENAI_API_KEY}`
}
})
.then(async (res) => {
if (!res.ok) throw await res.json();
return res.json();
if (type === 'all') {
if (settings.OPENAI_API_KEY) {
// Validate OPENAI_API_KEY
const openaiModelRes = await fetch(`https://api.openai.com/v1/models`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${settings.OPENAI_API_KEY}`
}
})
.catch((error) => {
console.log(error);
toast.error(`OpenAI: ${error?.error?.message ?? 'Network Problem'}`);
return null;
});
const openaiModels = openaiModelRes?.data ?? null;
.then(async (res) => {
if (!res.ok) throw await res.json();
return res.json();
})
.catch((error) => {
console.log(error);
toast.error(`OpenAI: ${error?.error?.message ?? 'Network Problem'}`);
return null;
});
const openaiModels = openaiModelRes?.data ?? null;
if (openaiModels) {
models = [
...(res?.models ?? []),
{ name: 'hr' },
if (openaiModels) {
models = [
...(res?.models ?? []),
{ name: 'hr' },
...openaiModels
.map((model) => ({ name: model.id, label: 'OpenAI' }))
.filter((model) => model.name.includes('gpt'))
];
...openaiModels
.map((model) => ({ name: model.id, label: 'OpenAI' }))
.filter((model) => model.name.includes('gpt'))
];
} else {
models = res?.models ?? [];
}
} else {
models = res?.models ?? [];
}
} else {
models = res?.models ?? [];
}
return models;
return models;
} else {
return res?.models ?? null;
}
};
const sendPrompt = async (userPrompt) => {