Commit `109cfef2ae`

109cfef2ae202d32677032ecff1f4fcc12d30e49

Unsigned

cmc <hello@cleberg.net> · 2026-04-19 03:57 UTC

clarify ollama settings in docker environments

Layout: unified · split

src/components/SettingsPanel.tsx +5 −3

                     onChange={e => setUrl(e.target.value)}
                     onBlur={commitUrl}
                     onKeyDown={e => e.key === 'Enter' && commitUrl()}
-                    placeholder="http://localhost:11434"
+                    placeholder="empty = same-origin proxy (recommended)"
                     spellCheck={false}
                   />
                   <button
               Install from <strong>ollama.com</strong>, then pull any model to get started.
             </p>
             <p>
-              If connection fails, ensure Ollama is running and CORS is open:<br />
+              Leave <strong>Server URL</strong> empty to route through the app's
-              <code>OLLAMA_ORIGINS=* ollama serve</code>
+              own server (works automatically with the Docker setup). For local
+              dev, set it to <code>http://localhost:11434</code> and ensure CORS
+              is open: <code>OLLAMA_ORIGINS=* ollama serve</code>
             </p>
           </div>
         </div>

src/engine/aiGenerator.ts +8 −3

   settings: OllamaSettings,
   signal?: AbortSignal,
 ): Promise<BrandOutputs> {
-  const url = `${settings.baseUrl.replace(/\/$/, '')}/api/chat`;
+  // Empty baseUrl means "same origin" — nginx proxies /api/ to Ollama internally.
+  // A full URL (e.g. http://localhost:11434) is used as-is for local dev.
+  const base = settings.baseUrl ? settings.baseUrl.replace(/\/$/, '') : '';
+  const url = `${base}/api/chat`;
   let res: Response;
   try {
     });
   } catch (err) {
     if ((err as Error).name === 'AbortError') throw err;
-    throw new Error(`Cannot reach Ollama at ${settings.baseUrl}. Is it running?`);
+    const target = settings.baseUrl || '(same origin /api/)';
+    throw new Error(`Cannot reach Ollama at ${target}. Is it running?`);
   }
   if (!res.ok) {
 // Test connectivity and return available model names
 export async function testOllamaConnection(baseUrl: string): Promise<string[]> {
-  const url = `${baseUrl.replace(/\/$/, '')}/api/tags`;
+  const base = baseUrl ? baseUrl.replace(/\/$/, '') : '';
+  const url = `${base}/api/tags`;
   const res = await fetch(url, { signal: AbortSignal.timeout(5000) });
   if (!res.ok) throw new Error(`Ollama responded with ${res.status}`);
   const data = await res.json() as { models?: Array<{ name: string }> };

src/hooks/useSettings.ts +1 −1

	@@ -8,7 +8,7 @@ export interface OllamaSettings {
8		8
9	const DEFAULTS: OllamaSettings = {	9	const DEFAULTS: OllamaSettings = {
10	enabled: false,	10	enabled: false,
11	baseUrl: 'http://localhost:11434',	11	baseUrl: '', // empty = same-origin proxy (/api/ via nginx); set to http://localhost:11434 for local dev
12	model: 'llama3.2',	12	model: 'llama3.2',
13	};	13	};
14		14

Commit 109cfef2ae