Allowing empty key for openai compatible, and fixing some tests (#287)

* Allowing empty key for openai compatible, and fixing some tests * Removing unneeded change
mattermost · Jan 29, 2025 · 50c06ca · 50c06ca
1 parent c2534bc
commit 50c06ca
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/server/llm/configuration.go b/server/llm/configuration.go
@@ -82,7 +82,9 @@ func (c *BotConfig) IsValid() bool {
 	switch c.Service.Type {
 	case ServiceTypeOpenAI:
 		return c.Service.APIKey != ""
-	case ServiceTypeOpenAICompatible, ServiceTypeAzure:
+	case ServiceTypeOpenAICompatible:
+		return c.Service.APIURL != ""
+	case ServiceTypeAzure:
 		return c.Service.APIKey != "" && c.Service.APIURL != ""
 	case ServiceTypeAnthropic:
 		return c.Service.APIKey != ""

diff --git a/server/llm/configuration_test.go b/server/llm/configuration_test.go
@@ -236,11 +236,33 @@ func TestBotConfig_IsValid(t *testing.T) {
 					InputTokenLimit:         100,
 					StreamingTimeoutSeconds: 60,
 				},
-				ChannelAccessLevel: ChannelAccessLevelNone + 1,
-				UserAccessLevel:    UserAccessLevelNone,
+				ChannelAccessLevel: ChannelAccessLevelAll,
+				UserAccessLevel:    UserAccessLevelAll,
 			},
 			want: false,
 		},
+		{
+			name: "OpenAI compatible service do not requires API Key to be set",
+			fields: fields{
+				ID:                 "xxx",
+				Name:               "xxx",
+				DisplayName:        "xxx",
+				CustomInstructions: "",
+				Service: ServiceConfig{
+					Name:                    "Copilot",
+					Type:                    "openaicompatible",
+					APIKey:                  "", // not bad
+					APIURL:                  "http://localhost",
+					OrgID:                   "org-xyz",
+					DefaultModel:            "gpt-40",
+					InputTokenLimit:         100,
+					StreamingTimeoutSeconds: 60,
+				},
+				ChannelAccessLevel: ChannelAccessLevelAll,
+				UserAccessLevel:    UserAccessLevelAll,
+			},
+			want: true,
+		},
 		{
 			name: "Ask Sage service requires username to be set",
 			fields: fields{
@@ -257,8 +279,8 @@ func TestBotConfig_IsValid(t *testing.T) {
 					InputTokenLimit:         100,
 					StreamingTimeoutSeconds: 60,
 				},
-				ChannelAccessLevel: ChannelAccessLevelNone + 1,
-				UserAccessLevel:    UserAccessLevelNone,
+				ChannelAccessLevel: ChannelAccessLevelAll,
+				UserAccessLevel:    UserAccessLevelAll,
 			},
 			want: false,
 		},
@@ -278,8 +300,8 @@ func TestBotConfig_IsValid(t *testing.T) {
 					InputTokenLimit:         100,
 					StreamingTimeoutSeconds: 60,
 				},
-				ChannelAccessLevel: ChannelAccessLevelNone + 1,
-				UserAccessLevel:    UserAccessLevelNone,
+				ChannelAccessLevel: ChannelAccessLevelAll,
+				UserAccessLevel:    UserAccessLevelAll,
 			},
 			want: false,
 		},