Personal AI, On Personal Devices
Python
fix: frontend now uses settings API URL for all backend requests (#49)
Robby Manihani07ec747c8f9a
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.tsindex 206ec4f6..2b94edad 100644--- a/frontend/src/lib/api.ts+++ b/frontend/src/lib/api.ts@@ -17,7 +17,20 @@ export const isTauri = () => typeof window !== 'undefined' && !!window.__TAURI_Iconst DESKTOP_API = 'http://127.0.0.1:8000';-const getBase = () => {+const getSettingsApiUrl = (): string => {+ try {+ const raw = localStorage.getItem('openjarvis-settings');+ if (raw) {+ const parsed = JSON.parse(raw);+ if (parsed.apiUrl) return parsed.apiUrl.replace(/\/+$/, '');+ }+ } catch {}+ return '';+};++export const getBase = (): string => {+ const settingsUrl = getSettingsApiUrl();+ if (settingsUrl) return settingsUrl;if (import.meta.env.VITE_API_URL) return import.meta.env.VITE_API_URL;if (isTauri()) return DESKTOP_API;return '';diff --git a/frontend/src/lib/sse.ts b/frontend/src/lib/sse.tsindex b1cf624b..addd10b9 100644--- a/frontend/src/lib/sse.ts+++ b/frontend/src/lib/sse.ts@@ -1,5 +1,5 @@import type { SSEEvent } from '../types';-import { isTauri } from './api';+import { getBase } from './api';export interface ChatRequest {model: string;@@ -7,13 +7,11 @@ export interface ChatRequest {stream: true;}-const DESKTOP_API = 'http://127.0.0.1:8000';-export async function* streamChat(request: ChatRequest,signal?: AbortSignal,): AsyncGenerator<SSEEvent> {- const base = import.meta.env.VITE_API_URL || (isTauri() ? DESKTOP_API : '');+ const base = getBase();const response = await fetch(`${base}/v1/chat/completions`, {method: 'POST',headers: { 'Content-Type': 'application/json' },diff --git a/frontend/src/pages/SettingsPage.tsx b/frontend/src/pages/SettingsPage.tsxindex 91b8566b..2dbe4c37 100644--- a/frontend/src/pages/SettingsPage.tsx+++ b/frontend/src/pages/SettingsPage.tsx@@ -188,7 +188,7 @@ export function SettingsPage() {</span></div></SettingRow>- <SettingRow label="API URL" description="Leave empty for same-origin">+ <SettingRow label="API URL" description="Set if backend runs on a different port or host"><inputtype="text"value={settings.apiUrl}diff --git a/frontend/vite.config.ts b/frontend/vite.config.tsindex 4dcec29b..8c748dac 100644--- a/frontend/vite.config.ts+++ b/frontend/vite.config.ts@@ -46,8 +46,8 @@ export default defineConfig({server: {port: 5173,proxy: {- '/v1': 'http://localhost:8000',- '/health': 'http://localhost:8000',+ '/v1': process.env.VITE_API_URL || 'http://localhost:8000',+ '/health': process.env.VITE_API_URL || 'http://localhost:8000',},},});