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

		@@ -86,7 +86,7 @@ export function SettingsPanel({ settings, onChange, onClose }: Props) {
86	86	onChange={e => setUrl(e.target.value)}
87	87	onBlur={commitUrl}
88	88	onKeyDown={e => e.key === 'Enter' && commitUrl()}
89		placeholder="http://localhost:11434"
	89	placeholder="empty = same-origin proxy (recommended)"
90	90	spellCheck={false}
91	91	/>
92	92	<button
		@@ -147,8 +147,10 @@ export function SettingsPanel({ settings, onChange, onClose }: Props) {
147	147	Install from <strong>ollama.com</strong>, then pull any model to get started.
148	148	</p>
149	149	<p>
150		If connection fails, ensure Ollama is running and CORS is open:<br />
151		<code>OLLAMA_ORIGINS=* ollama serve</code>
	150	Leave <strong>Server URL</strong> empty to route through the app's
	151	own server (works automatically with the Docker setup). For local
	152	dev, set it to <code>http://localhost:11434</code> and ensure CORS
	153	is open: <code>OLLAMA_ORIGINS=* ollama serve</code>
152	154	</p>
153	155	</div>
154	156	</div>

src/engine/aiGenerator.ts +8 −3

		@@ -84,7 +84,10 @@ export async function generateWithAI(
84	84	settings: OllamaSettings,
85	85	signal?: AbortSignal,
86	86	): Promise<BrandOutputs> {
87		const url = `${settings.baseUrl.replace(/\/$/, '')}/api/chat`;
	87	// Empty baseUrl means "same origin" — nginx proxies /api/ to Ollama internally.
	88	// A full URL (e.g. http://localhost:11434) is used as-is for local dev.
	89	const base = settings.baseUrl ? settings.baseUrl.replace(/\/$/, '') : '';
	90	const url = `${base}/api/chat`;
88	91
89	92	let res: Response;
90	93	try {
		@@ -104,7 +107,8 @@ export async function generateWithAI(
104	107	});
105	108	} catch (err) {
106	109	if ((err as Error).name === 'AbortError') throw err;
107		throw new Error(`Cannot reach Ollama at ${settings.baseUrl}. Is it running?`);
	110	const target = settings.baseUrl \|\| '(same origin /api/)';
	111	throw new Error(`Cannot reach Ollama at ${target}. Is it running?`);
108	112	}
109	113
110	114	if (!res.ok) {
		@@ -130,7 +134,8 @@ export async function generateWithAI(
130	134
131	135	// Test connectivity and return available model names
132	136	export async function testOllamaConnection(baseUrl: string): Promise<string[]> {
133		const url = `${baseUrl.replace(/\/$/, '')}/api/tags`;
	137	const base = baseUrl ? baseUrl.replace(/\/$/, '') : '';
	138	const url = `${base}/api/tags`;
134	139	const res = await fetch(url, { signal: AbortSignal.timeout(5000) });
135	140	if (!res.ok) throw new Error(`Ollama responded with ${res.status}`);
136	141	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	9	const DEFAULTS: OllamaSettings = {
10	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	12	model: 'llama3.2',
13	13	};
14	14

Commit 109cfef2ae