From 5b7c4988d45225d549e6bfa7c14be9d8dab74880 Mon Sep 17 00:00:00 2001
From: Adrien <adrien.bouvais.pro@gmail.com>
Date: Sun, 16 Jun 2024 12:17:16 +0200
Subject: [PATCH] Added company name to model list

---
 Chat.go                            | 19 ++++++++++++++++++-
 MyUtils.go                         | 21 ---------------------
 views/partials/popover-models.html |  2 +-
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Chat.go b/Chat.go
index c804ba1..91ac065 100644
--- a/Chat.go
+++ b/Chat.go
@@ -753,7 +753,24 @@ func GenerateModelPopoverHTML(refresh bool, c *fiber.Ctx) string {
 		panic(err)
 	}
 
-	modelInfos := GetAvailableModels(c)
+	var modelInfos []ModelInfo
+	err = edgeGlobalClient.WithGlobals(map[string]interface{}{"ext::auth::client_token": c.Cookies("jade-edgedb-auth-token")}).Query(edgeCtx, `
+		SELECT ModelInfo {
+			modelID,
+			name,
+			company : {
+				name,
+				icon
+			}
+		} 
+		FILTER .modelID != 'none' AND .company.name != 'huggingface' AND .company IN global currentUser.setting.keys.company
+		ORDER BY .company.name ASC THEN .name ASC
+	`, &modelInfos)
+	if err != nil {
+		fmt.Println("Error getting models")
+		panic(err)
+	}
+
 	isPremium, isBasic := IsCurrentUserSubscribed(c)
 
 	out, err := modelPopoverTmpl.Execute(pongo2.Context{
diff --git a/MyUtils.go b/MyUtils.go
index 9b99b3f..7a15de6 100644
--- a/MyUtils.go
+++ b/MyUtils.go
@@ -231,24 +231,3 @@ func Message2RequestMessage(messages []Message, context string) []RequestMessage
 		return m
 	}
 }
-
-func GetAvailableModels(c *fiber.Ctx) []ModelInfo {
-	var models []ModelInfo
-	err := edgeGlobalClient.WithGlobals(map[string]interface{}{"ext::auth::client_token": c.Cookies("jade-edgedb-auth-token")}).Query(edgeCtx, `
-		SELECT ModelInfo {
-			modelID,
-			name,
-			company : {
-				name,
-				icon
-			}
-		} 
-		FILTER .modelID != 'none' AND .company.name != 'huggingface' AND .company IN global currentUser.setting.keys.company
-		ORDER BY .company.name ASC THEN .name ASC
-	`, &models)
-	if err != nil {
-		fmt.Println("Error getting models")
-		panic(err)
-	}
-	return models
-}
diff --git a/views/partials/popover-models.html b/views/partials/popover-models.html
index 5bebde5..f0121bf 100644
--- a/views/partials/popover-models.html
+++ b/views/partials/popover-models.html
@@ -48,7 +48,7 @@
                     <div class="select is-fullwidth is-small mb-3" id="model-id-input">
                         <select name="selectedLLMId">
                             {% for modelInfo in ModelInfos %}
-                            <option value="{{ modelInfo.ModelID }}">{{ modelInfo.Name }}</option>
+                            <option value="{{ modelInfo.ModelID }}">{{ modelInfo.Company.Name }} - {{ modelInfo.Name }}</option>
                             {% endfor %}
                             <option value="{% if IsSub %}custom{% else %}none{% endif %}">Inference Endpoints</option>
                         </select>