Merge pull request #3 from ollama-webui/main

endpoint error fix
This commit is contained in:
Timothy Jaeryang Baek 2023-10-18 21:54:31 -07:00 committed by GitHub
commit 89399f1a3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions

View file

@ -1,10 +1,7 @@
import { browser, dev } from '$app/environment'; import { browser, dev } from '$app/environment';
export const ENDPOINT = export const ENDPOINT = browser
process.env.OLLAMA_ENDPOINT != undefined ? `http://${location.hostname}:11434`
? process.env.OLLAMA_ENDPOINT : dev
: browser ? 'http://127.0.0.1:11434'
? `http://${location.hostname}:11434` : 'http://host.docker.internal:11434';
: dev
? 'http://127.0.0.1:11434'
: 'http://host.docker.internal:11434';

View file

@ -2,13 +2,18 @@ import { ENDPOINT } from '$lib/contants';
import type { PageServerLoad } from './$types'; import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ url }) => { export const load: PageServerLoad = async ({ url }) => {
const models = await fetch(`${ENDPOINT}/api/tags`, { const OLLAMA_ENDPOINT = process.env.OLLAMA_ENDPOINT;
method: 'GET', console.log(OLLAMA_ENDPOINT);
headers: { const models = await fetch(
Accept: 'application/json', `${OLLAMA_ENDPOINT != undefined ? OLLAMA_ENDPOINT : ENDPOINT}/api/tags`,
'Content-Type': 'application/json' {
method: 'GET',
headers: {
Accept: 'application/json',
'Content-Type': 'application/json'
}
} }
}) )
.then(async (res) => { .then(async (res) => {
if (!res.ok) throw await res.json(); if (!res.ok) throw await res.json();
return res.json(); return res.json();