Extract model filter to the server connection

- this allows us to use the same filtering code in multiple places
mrdjohnson · Jun 27, 2024 · 128124b · 128124b
1 parent 1ece694
commit 128124b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/src/features/connections/servers/A1111ServerConnection.ts b/src/features/connections/servers/A1111ServerConnection.ts
@@ -65,6 +65,13 @@ class A1111ServerConnection extends ServerConnection<IA1111Model> {
 
     return camelcaseKeys<IA1111Model[]>(response.data).map(LanguageModel.fromIA1111Model)
   }
+
+  override modelFilter(model: A1111LanguageModel, filterText: string) {
+    return (
+      model.modelName.toLowerCase().includes(filterText.toLowerCase()) ||
+      model.label.toLowerCase().includes(filterText.toLowerCase())
+    )
+  }
 }
 
 export default A1111ServerConnection
diff --git a/src/features/connections/servers/OpenAiServerConnection.tsx b/src/features/connections/servers/OpenAiServerConnection.tsx
@@ -83,6 +83,13 @@ class OpenAiServerConnection extends ServerConnection<IOpenAiModel> {
 
     return trueResponse.map(model => LanguageModel.fromIOpenAiModel(model))
   }
+
+  override modelFilter(model: OpenAiLanguageModel, filterText: string) {
+    return (
+      model.modelName.toLowerCase().includes(filterText.toLowerCase()) ||
+      model.ownedBy.toLowerCase().includes(filterText.toLowerCase())
+    )
+  }
 }
 
 export default OpenAiServerConnection
diff --git a/src/features/connections/servers/ServerConnection.tsx b/src/features/connections/servers/ServerConnection.tsx
@@ -105,6 +105,10 @@ abstract class ServerConnection<
   ) => ReactNode
 
   abstract api: BaseApi
+
+  modelFilter(model: LanguageModelType<BaseModelType>, filterText: string) {
+    return model.modelName.toLowerCase().includes(filterText.toLowerCase())
+  }
 }
 
 export default ServerConnection
diff --git a/src/features/settings/panels/model/A1111ModelPanel.tsx b/src/features/settings/panels/model/A1111ModelPanel.tsx
@@ -28,12 +28,7 @@ const A1111ModelPanel = observer(({ connection }: { connection: A1111ServerConne
       onItemSelected={model =>
         connectionModelStore.dataStore.setSelectedModel(model, connection.id)
       }
-      itemFilter={(model, filterText) => {
-        return (
-          model.modelName.toLowerCase().includes(filterText.toLowerCase()) ||
-          model.label.toLowerCase().includes(filterText.toLowerCase())
-        )
-      }}
+      itemFilter={connection.modelFilter}
       primarySortTypeLabel={connection.primaryHeader}
       renderRow={renderRow}
       getIsItemSelected={model =>

diff --git a/src/features/settings/panels/model/LmsModelPanel.tsx b/src/features/settings/panels/model/LmsModelPanel.tsx
@@ -39,9 +39,7 @@ const LmsModelPanel = observer(({ connection }: { connection: LmsServerConnectio
       onItemSelected={model =>
         connectionModelStore.dataStore.setSelectedModel(model, connection.id)
       }
-      itemFilter={(model, filterText) => {
-        return model.modelName.toLowerCase().includes(filterText.toLowerCase())
-      }}
+      itemFilter={connection.modelFilter}
       primarySortTypeLabel={connection.primaryHeader}
       renderRow={renderRow}
       getIsItemSelected={model =>

diff --git a/src/features/settings/panels/model/OllamaModelPanel.tsx b/src/features/settings/panels/model/OllamaModelPanel.tsx
@@ -85,9 +85,7 @@ const OllamaModelPanelTable = observer(
         items={connection.models}
         sortTypes={connection.modelTableHeaders}
         primarySortTypeLabel="name"
-        itemFilter={(model: IOllamaModel, filterText: string) =>
-          model.name.toLowerCase().includes(filterText.toLowerCase())
-        }
+        itemFilter={connection.modelFilter}
         renderRow={renderRow}
         getItemKey={model => model.name}
         onItemSelected={model =>

diff --git a/src/features/settings/panels/model/OpenAiModelPanel.tsx b/src/features/settings/panels/model/OpenAiModelPanel.tsx
@@ -37,12 +37,7 @@ const OpenAiModelPanel = observer(({ connection }: { connection: OpenAiServerCon
       onItemSelected={model =>
         connectionModelStore.dataStore.setSelectedModel(model, connection.id)
       }
-      itemFilter={(model, filterText) => {
-        return (
-          model.modelName.toLowerCase().includes(filterText.toLowerCase()) ||
-          model.ownedBy.toLowerCase().includes(filterText.toLowerCase())
-        )
-      }}
+      itemFilter={connection.modelFilter}
       primarySortTypeLabel={connection.primaryHeader}
       renderRow={renderRow}
       getIsItemSelected={model =>