From 49381ccf2346ea210c8a9178427a291d166892c5 Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Wed, 11 Sep 2024 20:00:06 +0800 Subject: [PATCH 1/2] Update go-openai dependency to v1.29.1 --- api/go.mod | 2 +- api/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/go.mod b/api/go.mod index 089b67d5..fd3be25b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -13,7 +13,7 @@ require ( github.com/pkoukk/tiktoken-go v0.1.6 github.com/rotisserie/eris v0.5.4 github.com/samber/lo v1.39.0 - github.com/sashabaranov/go-openai v1.24.1 + github.com/sashabaranov/go-openai v1.29.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/viper v1.18.2 github.com/tmc/langchaingo v0.0.0-20230610024316-06cb7b57ea80 diff --git a/api/go.sum b/api/go.sum index 97554b33..a8582a9a 100644 --- a/api/go.sum +++ b/api/go.sum @@ -130,8 +130,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= -github.com/sashabaranov/go-openai v1.24.1 h1:DWK95XViNb+agQtuzsn+FyHhn3HQJ7Va8z04DQDJ1MI= -github.com/sashabaranov/go-openai v1.24.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.29.1 h1:AlB+vwpg1tibwr83OKXLsI4V1rnafVyTlw0BjR+6WUM= +github.com/sashabaranov/go-openai v1.29.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= From fca8cfbd6208e66a09cccbe9a37c10a75ada54d7 Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Wed, 11 Sep 2024 20:08:55 +0800 Subject: [PATCH 2/2] Remove commented-out timeout configuration in OpenAI client setup. --- api/chat_main_handler.go | 1 + api/llm_openai.go | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/chat_main_handler.go b/api/chat_main_handler.go index 56af9f20..484dc55b 100644 --- a/api/chat_main_handler.go +++ b/api/chat_main_handler.go @@ -617,6 +617,7 @@ func (h *ChatHandler) CompletionStream(w http.ResponseWriter, chatSession sqlc_q return "", "", true } + client := openai.NewClientWithConfig(config) // latest message contents prompt := chat_compeletion_messages[len(chat_compeletion_messages)-1].Content diff --git a/api/llm_openai.go b/api/llm_openai.go index a9e39c90..132d34af 100644 --- a/api/llm_openai.go +++ b/api/llm_openai.go @@ -142,8 +142,7 @@ func genOpenAIConfig(chatModel sqlc_queries.ChatModel) (openai.ClientConfig, err config = openai.DefaultConfig(token) config.BaseURL = baseUrl // two minutes timeout - config.HTTPClient.Timeout = 120 * time.Second - + // config.HTTPClient.Timeout = 120 * time.Second configOpenAIProxy(&config) } return config, err