From ecb4d1b8d95a6a982be5b49af89f469ba65f9fcf Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Wed, 18 Oct 2023 21:47:28 -0700 Subject: [PATCH] endpoint error fix --- src/lib/contants.ts | 13 +++++-------- src/routes/+page.server.ts | 17 +++++++++++------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/lib/contants.ts b/src/lib/contants.ts index 06044f7bb..d76fce8a1 100644 --- a/src/lib/contants.ts +++ b/src/lib/contants.ts @@ -1,10 +1,7 @@ import { browser, dev } from '$app/environment'; -export const ENDPOINT = - process.env.OLLAMA_ENDPOINT != undefined - ? process.env.OLLAMA_ENDPOINT - : browser - ? `http://${location.hostname}:11434` - : dev - ? 'http://127.0.0.1:11434' - : 'http://host.docker.internal:11434'; +export const ENDPOINT = browser + ? `http://${location.hostname}:11434` + : dev + ? 'http://127.0.0.1:11434' + : 'http://host.docker.internal:11434'; diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index c4559b060..f86b79956 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -2,13 +2,18 @@ import { ENDPOINT } from '$lib/contants'; import type { PageServerLoad } from './$types'; export const load: PageServerLoad = async ({ url }) => { - const models = await fetch(`${ENDPOINT}/api/tags`, { - method: 'GET', - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json' + const OLLAMA_ENDPOINT = process.env.OLLAMA_ENDPOINT; + console.log(OLLAMA_ENDPOINT); + const models = await fetch( + `${OLLAMA_ENDPOINT != undefined ? OLLAMA_ENDPOINT : ENDPOINT}/api/tags`, + { + method: 'GET', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json' + } } - }) + ) .then(async (res) => { if (!res.ok) throw await res.json(); return res.json();