Server Connection host should ignore trailing / and spaces

mrdjohnson · Jun 22, 2024 · 1d8e256 · 1d8e256
1 parent 017e868
commit 1d8e256
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/src/features/connections/api/A1111Api.ts b/src/features/connections/api/A1111Api.ts
@@ -7,7 +7,7 @@ import { connectionModelStore } from '~/features/connections/ConnectionModelStor
 class A1111Api extends BaseApi {
   async generateImages(prompt: string, incomingMessageVariant: IMessageModel): Promise<string[]> {
     const connection = connectionModelStore.selectedConnection
-    const host = connection?.host || connection?.DefaultHost
+    const host = connection?.formattedHost
 
     if (!connection || !host) return []
 

diff --git a/src/features/connections/api/LmsApi.ts b/src/features/connections/api/LmsApi.ts
@@ -48,7 +48,7 @@ export class LmsApi extends BaseApi {
     incomingMessageVariant: IMessageModel,
   ) {
     const connection = connectionModelStore.selectedConnection
-    const host = connection?.host || connection?.DefaultHost
+    const host = connection?.formattedHost
 
     const modelName = connectionModelStore.selectedModelName
     if (!connection || !host || !modelName) return

diff --git a/src/features/connections/api/OllamaApi.ts b/src/features/connections/api/OllamaApi.ts
@@ -77,7 +77,7 @@ export class OllamaApi extends BaseApi {
     incomingMessageVariant: IMessageModel,
   ): AsyncGenerator<string> {
     const connection = connectionModelStore.selectedConnection
-    const host = connection?.host || connection?.DefaultHost
+    const host = connection?.formattedHost
 
     const model = connectionModelStore.selectedModelName
     if (!connection || !host || !model) return

diff --git a/src/features/connections/api/OpenAiApi.ts b/src/features/connections/api/OpenAiApi.ts
@@ -81,7 +81,7 @@ export class OpenAiApi extends BaseApi {
     incomingMessageVariant: IMessageModel,
   ): AsyncGenerator<string> {
     const connection = connectionModelStore.selectedConnection
-    const host = connection?.host || connection?.DefaultHost
+    const host = connection?.formattedHost
 
     const model = connectionModelStore.selectedModelName
     if (!connection || !model) return

diff --git a/src/features/connections/servers/ServerConnection.tsx b/src/features/connections/servers/ServerConnection.tsx
@@ -58,6 +58,14 @@ abstract class ServerConnection<
     this.isConnected = isConnected
   }
 
+  get formattedHost() {
+    const host = this.host || this.DefaultHost
+
+    if (host.endsWith('/')) return host.trim().substring(0, host.length - 1)
+
+    return host.trim()
+  }
+
   protected abstract _fetchLmModels(host: string): Promise<Array<LanguageModelType<BaseModelType>>>
 
   async fetchLmModels() {

diff --git a/src/features/ollama/OllamaStore.tsx b/src/features/ollama/OllamaStore.tsx
@@ -15,7 +15,7 @@ class OllamaStore {
   }
 
   get ollama() {
-    return new Ollama({ host: this.connection.host || this.connection.DefaultHost })
+    return new Ollama({ host: this.connection.formattedHost })
   }
 
   show(modelName: string) {