Merge branch 'master' into server-dep

.nvmrc

@@ -1 +1 @@
-16.13.1
+20.11

server/ai/configuration.go

@@ -27,7 +27,7 @@ func (c *BotConfig) IsValid() bool {
 	isInvalid := c.Name == "" ||
 		c.DisplayName == "" ||
 		c.Service.Type == "" ||
-		(c.Service.Type == "openaicompatible" && c.Service.APIURL == "") ||
-		(c.Service.Type != "asksage" && c.Service.Type != "openaicompatible" && c.Service.APIKey == "")
+		((c.Service.Type == "openaicompatible" || c.Service.Type == "azure") && c.Service.APIURL == "") ||
+		(c.Service.Type != "asksage" && c.Service.Type != "openaicompatible" && c.Service.Type != "azure" && c.Service.APIKey == "")
 	return !isInvalid
 }

server/ai/openai/openai.go

@@ -10,7 +10,6 @@ import (
 	"image/png"
 	"io"
 	"net/http"
-	"net/url"
 	"strings"
 	"time"
 
@@ -39,40 +38,49 @@ const OpenAIMaxImageSize = 20 * 1024 * 1024 // 20 MB
 
 var ErrStreamingTimeout = errors.New("timeout streaming")
 
-func NewCompatible(llmService ai.ServiceConfig, httpClient *http.Client, metricsService metrics.LLMetrics) *OpenAI {
-	apiKey := llmService.APIKey
-	endpointURL := strings.TrimSuffix(llmService.APIURL, "/")
-	defaultModel := llmService.DefaultModel
-	config := openaiClient.DefaultConfig(apiKey)
-	config.BaseURL = endpointURL
-	config.HTTPClient = httpClient
-
-	parsedURL, err := url.Parse(endpointURL)
-	if err == nil && strings.HasSuffix(parsedURL.Host, "openai.azure.com") {
-		config = openaiClient.DefaultAzureConfig(apiKey, endpointURL)
-		config.APIVersion = "2023-07-01-preview"
-	}
+func NewAzure(llmService ai.ServiceConfig, httpClient *http.Client, metricsService metrics.LLMetrics) *OpenAI {
+	return newOpenAI(llmService, httpClient, metricsService,
+		func(apiKey string) openaiClient.ClientConfig {
+			config := openaiClient.DefaultAzureConfig(apiKey, strings.TrimSuffix(llmService.APIURL, "/"))
+			config.APIVersion = "2024-06-01"
+			return config
+		},
+	)
+}
 
-	streamingTimeout := StreamingTimeoutDefault
-	if llmService.StreamingTimeoutSeconds > 0 {
-		streamingTimeout = time.Duration(llmService.StreamingTimeoutSeconds) * time.Second
-	}
-	return &OpenAI{
-		client:           openaiClient.NewClientWithConfig(config),
-		defaultModel:     defaultModel,
-		tokenLimit:       llmService.TokenLimit,
-		streamingTimeout: streamingTimeout,
-		metricsService:   metricsService,
-	}
+func NewCompatible(llmService ai.ServiceConfig, httpClient *http.Client, metricsService metrics.LLMetrics) *OpenAI {
+	return newOpenAI(llmService, httpClient, metricsService,
+		func(apiKey string) openaiClient.ClientConfig {
+			config := openaiClient.DefaultConfig(apiKey)
+			config.BaseURL = strings.TrimSuffix(llmService.APIURL, "/")
+			return config
+		},
+	)
 }
 
 func New(llmService ai.ServiceConfig, httpClient *http.Client, metricsService metrics.LLMetrics) *OpenAI {
+	return newOpenAI(llmService, httpClient, metricsService,
+		func(apiKey string) openaiClient.ClientConfig {
+			config := openaiClient.DefaultConfig(apiKey)
+			config.OrgID = llmService.OrgID
+			return config
+		},
+	)
+}
+
+func newOpenAI(
+	llmService ai.ServiceConfig,
+	httpClient *http.Client,
+	metricsService metrics.LLMetrics,
+	baseConfigFunc func(apiKey string) openaiClient.ClientConfig,
+) *OpenAI {
+	apiKey := llmService.APIKey
 	defaultModel := llmService.DefaultModel
 	if defaultModel == "" {
 		defaultModel = openaiClient.GPT3Dot5Turbo
 	}
-	config := openaiClient.DefaultConfig(llmService.APIKey)
-	config.OrgID = llmService.OrgID
+
+	config := baseConfigFunc(apiKey)
 	config.HTTPClient = httpClient
 
 	streamingTimeout := StreamingTimeoutDefault

server/plugin.go

@@ -154,6 +154,8 @@ func (p *Plugin) getLLM(llmBotConfig ai.BotConfig) ai.LanguageModel {
 		llm = openai.New(llmBotConfig.Service, p.llmUpstreamHTTPClient, llmMetrics)
 	case "openaicompatible":
 		llm = openai.NewCompatible(llmBotConfig.Service, p.llmUpstreamHTTPClient, llmMetrics)
+	case "azure":
+		llm = openai.NewAzure(llmBotConfig.Service, p.llmUpstreamHTTPClient, llmMetrics)
 	case "anthropic":
 		llm = anthropic.New(llmBotConfig.Service, p.llmUpstreamHTTPClient, llmMetrics)
 	case "asksage":
@@ -185,6 +187,8 @@ func (p *Plugin) getTranscribe() ai.Transcriber {
 		return openai.New(botConfig.Service, p.llmUpstreamHTTPClient, llmMetrics)
 	case "openaicompatible":
 		return openai.NewCompatible(botConfig.Service, p.llmUpstreamHTTPClient, llmMetrics)
+	case "azure":
+		return openai.NewAzure(botConfig.Service, p.llmUpstreamHTTPClient, llmMetrics)
 	}
 	return nil
 }

webapp/.eslintrc.json

@@ -643,6 +643,7 @@
             "@typescript-eslint/prefer-interface": 0,
             "@typescript-eslint/explicit-function-return-type": 0,
             "@typescript-eslint/explicit-module-boundary-types": 0,
+            "@typescript-eslint/no-explicit-any": 0,
             "@typescript-eslint/indent": [
                2,
                4,