codedlabdev
diff --git a/‎app/lib/modules/llm/providers/ollama.ts‎
Lines changed: 35 additions & 7 deletions b/‎app/lib/modules/llm/providers/ollama.ts‎
Lines changed: 35 additions & 7 deletions
@@ -83,18 +83,36 @@ export default class OllamaProvider extends BaseProvider {
        */
       const isDocker = process?.env?.RUNNING_IN_DOCKER === 'true' || serverEnv?.RUNNING_IN_DOCKER === 'true';
 
-      baseUrl = isDocker ? baseUrl.replace('localhost', 'host.docker.internal') : baseUrl;
-      baseUrl = isDocker ? baseUrl.replace('127.0.0.1', 'host.docker.internal') : baseUrl;
+      if (isDocker) {
+        try {
+          const url = new URL(baseUrl);
+          if (url.hostname === 'localhost' || url.hostname === '127.0.0.1') {
+            url.hostname = 'host.docker.internal';
+            baseUrl = url.toString().replace(/\/$/, '');
+          }
+        } catch (error) {
+          logger.warn('Failed to parse Ollama baseUrl for Docker mapping:', error);
+        }
+      }
     }
 
     const response = await fetch(`${baseUrl}/api/tags`);
+
+    if (!response.ok) {
+      throw new Error(
+        `Failed to fetch Ollama models: HTTP ${response.status} ${response.statusText}`,
+      );
+    }
+
     const data = (await response.json()) as OllamaApiResponse;
 
-    // console.log({ ollamamodels: data.models });
+    if (!data || !Array.isArray(data.models)) {
+      throw new Error('Invalid response from Ollama API: missing models array');
+    }
 
     return data.models.map((model: OllamaModel) => ({
       name: model.name,
-      label: `${model.name} (${model.details.parameter_size})`,
+      label: `${model.name} (${model.details?.parameter_size || 'unknown'})`,
       provider: this.name,
       maxTokenAllowed: 8000,
       maxCompletionTokens: 8000,
@@ -119,14 +137,24 @@ export default class OllamaProvider extends BaseProvider {
       defaultApiTokenKey: '',
     });
 
-    // Backend: Check if we're running in Docker
     if (!baseUrl) {
       throw new Error('No baseUrl found for OLLAMA provider');
     }
 
+    // Backend: Check if we're running in Docker
     const isDocker = process?.env?.RUNNING_IN_DOCKER === 'true' || envRecord.RUNNING_IN_DOCKER === 'true';
-    baseUrl = isDocker ? baseUrl.replace('localhost', 'host.docker.internal') : baseUrl;
-    baseUrl = isDocker ? baseUrl.replace('127.0.0.1', 'host.docker.internal') : baseUrl;
+
+    if (isDocker) {
+      try {
+        const url = new URL(baseUrl);
+        if (url.hostname === 'localhost' || url.hostname === '127.0.0.1') {
+          url.hostname = 'host.docker.internal';
+          baseUrl = url.toString().replace(/\/$/, '');
+        }
+      } catch (error) {
+        logger.warn('Failed to parse Ollama baseUrl for Docker mapping:', error);
+      }
+    }
 
     logger.debug('Ollama Base Url used: ', baseUrl);