Merge pull request #572 from innogames/openai_model

brainexe · web-flow · commit 7e0c6ce881b5 · 2024-06-10T12:40:27.000+02:00
openai: use gpt-4o by default
diff --git a/command/export/export.go b/command/export/export.go
@@ -15,6 +15,7 @@ import (
 	"github.com/slack-go/slack"
 )
 
+// limit the number of exported messages (incl thread messages)
 const limit = 3000
 
 // NewExportCommand is a constructor to create a new export command
diff --git a/command/openai/config.go b/command/openai/config.go
@@ -41,7 +41,7 @@ func (c *Config) IsEnabled() bool {
 
 var defaultConfig = Config{
 	APIHost:              apiHost,
-	Model:                "gpt-3.5-turbo", // aka model behind ChatGPT
+	Model:                "gpt-4o", // aka model behind ChatGPT
 	UpdateInterval:       time.Second * 1,
 	HistorySize:          25,
 	InitialSystemMessage: "You are a helpful Slack bot. By default, keep your answer short and truthful",
diff --git a/command/openai/openai_test.go b/command/openai/openai_test.go
@@ -77,25 +77,25 @@ func TestOpenai(t *testing.T) {
 			apiCompletionURL,
 			[]testRequest{
 				{
-					`{"model":"gpt-3.5-turbo","messages":[{"role":"system","content":"You are a helpful Slack bot. By default, keep your answer short and truthful"},{"role":"user","content":"whats 1+1?"}],"stream":true}`,
-					`data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{"role":"assistant"},"index":0,"finish_reason":null}]}
+					`{"model":"gpt-4o","messages":[{"role":"system","content":"You are a helpful Slack bot. By default, keep your answer short and truthful"},{"role":"user","content":"whats 1+1?"}],"stream":true}`,
+					`data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{"role":"assistant"},"index":0,"finish_reason":null}]}
 
-data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{"content":"The answer "},"index":0,"finish_reason":null}]}
+data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{"content":"The answer "},"index":0,"finish_reason":null}]}
 
-data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{"content":"is 2"},"index":0,"finish_reason":null}]}
+data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{"content":"is 2"},"index":0,"finish_reason":null}]}
 
-data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{},"index":0,"finish_reason":"stop"}]}
+data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{},"index":0,"finish_reason":"stop"}]}
 
 data: [DONE]`,
 					http.StatusOK,
 				},
 				{
-					`{"model":"gpt-3.5-turbo","messages":[{"role":"system","content":"You are a helpful Slack bot. By default, keep your answer short and truthful"},{"role":"user","content":"whats 1+1?"},{"role":"assistant","content":"The answer is 2"},{"role":"user","content":"whats 2+1?"}],"stream":true}`,
+					`{"model":"gpt-4o","messages":[{"role":"system","content":"You are a helpful Slack bot. By default, keep your answer short and truthful"},{"role":"user","content":"whats 1+1?"},{"role":"assistant","content":"The answer is 2"},{"role":"user","content":"whats 2+1?"}],"stream":true}`,
 					`{
 						 "id": "chatcmpl-6p9XYPYSTTRi0xEviKjjilqrWU2Ve",
 						 "object": "chat.completion",
 						 "created": 1677649420,
-						 "model": "gpt-3.5-turbo",
+						 "model": "gpt-4o",
 						 "usage": {"prompt_tokens": 56, "completion_tokens": 31, "total_tokens": 87},
 						 "choices": [
 						   {
@@ -171,7 +171,7 @@ data: [DONE]`,
 			apiCompletionURL,
 			[]testRequest{
 				{
-					`{"model":"gpt-3.5-turbo","messages":[{"role":"user","content":"whats 1+1?"}],"stream":true}`,
+					`{"model":"gpt-4o","messages":[{"role":"user","content":"whats 1+1?"}],"stream":true}`,
 					`{
 					  "error": {
 						"code": "invalid_api_key",
@@ -212,7 +212,7 @@ data: [DONE]`,
 
 			[]testRequest{
 				{
-					`{"model":"gpt-3.5-turbo","messages":[{"role":"user","content":"whats 1+1?"}],"stream":true}`,
+					`{"model":"gpt-4o","messages":[{"role":"user","content":"whats 1+1?"}],"stream":true}`,
 					`{
 					  "error": {
 						"code": "invalid_api_key",
@@ -252,12 +252,12 @@ data: [DONE]`,
 			apiCompletionURL,
 			[]testRequest{
 				{
-					`{"model":"gpt-3.5-turbo","messages":[{"role":"user","content":"whats 1+1?"}]}`,
+					`{"model":"gpt-4o","messages":[{"role":"user","content":"whats 1+1?"}]}`,
 					`{
 						 "id": "chatcmpl-6p9XYPYSTTRi0xEviKjjilqrWU2Ve",
 						 "object": "chat.completion",
 						 "created": 1677649420,
-						 "model": "gpt-3.5-turbo",
+						 "model": "gpt-4o",
 						 "usage": {"prompt_tokens": 56, "completion_tokens": 31, "total_tokens": 87},
 						 "choices": [
 						   {
@@ -293,12 +293,12 @@ data: [DONE]`,
 			apiCompletionURL,
 			[]testRequest{
 				{
-					`{"model":"gpt-3.5-turbo","messages":[{"role":"system","content":"You are a helpful Slack bot. By default, keep your answer short and truthful"},{"role":"system","content":"This is a Slack bot receiving a slack thread s context, using slack user ids as identifiers. Please use user mentions in the format \u003c@U123456\u003e"},{"role":"user","content":"User \u003c@U1234\u003e wrote: thread message 1"},{"role":"user","content":"whats 1+1?"}],"stream":true}`,
-					`data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{"role":"assistant"},"index":0,"finish_reason":null}]}
+					`{"model":"gpt-4o","messages":[{"role":"system","content":"You are a helpful Slack bot. By default, keep your answer short and truthful"},{"role":"system","content":"This is a Slack bot receiving a slack thread s context, using slack user ids as identifiers. Please use user mentions in the format \u003c@U123456\u003e"},{"role":"user","content":"User \u003c@U1234\u003e wrote: thread message 1"},{"role":"user","content":"whats 1+1?"}],"stream":true}`,
+					`data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{"role":"assistant"},"index":0,"finish_reason":null}]}
 
-data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{"content":"Jolo!"},"index":0,"finish_reason":null}]}
+data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{"content":"Jolo!"},"index":0,"finish_reason":null}]}
 
-data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{},"index":0,"finish_reason":"stop"}]}
+data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{},"index":0,"finish_reason":"stop"}]}
 
 data: [DONE]`,
 					http.StatusOK,
@@ -352,11 +352,11 @@ data: [DONE]`,
 			[]testRequest{
 				{
 					`{"model":"dummy-test","messages":[{"role":"user","content":"User \u003c@U1234\u003e wrote: i had a great weekend"},{"role":"user","content":"summarize this thread "}],"stream":true}`,
-					`data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{"role":"assistant"},"index":0,"finish_reason":null}]}
+					`data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{"role":"assistant"},"index":0,"finish_reason":null}]}
 
-data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{"content":"Jolo!"},"index":0,"finish_reason":null}]}
+data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{"content":"Jolo!"},"index":0,"finish_reason":null}]}
 
-data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-3.5-turbo-0301","choices":[{"delta":{},"index":0,"finish_reason":"stop"}]}
+data: {"id":"chatcmpl-6tuxebSPdmd2IJpb8GrZXHiYXON6r","object":"chat.completion.chunk","created":1678785018,"model":"gpt-4o-0301","choices":[{"delta":{},"index":0,"finish_reason":"stop"}]}
 
 data: [DONE]`,
 					http.StatusOK,
diff --git a/command/openai/tokens.go b/command/openai/tokens.go
@@ -7,13 +7,13 @@ import (
 // https://platform.openai.com/docs/models/gpt-3-5
 // https://platform.openai.com/docs/models/gpt-4
 var maxTokens = map[string]int{
-	"gpt-4":                8192,
-	"gpt-4-32k":            32768,
-	"gpt-4-1106-preview":   128000,
-	"gpt-4-vision-preview": 128000,
-	"gpt-3.5-turbo-16k":    16385,
-	"gpt-3.5-turbo":        4096,
-	"dummy-test":           100, // just for testing
+	"gpt-4":              8192,
+	"gpt-4-32k":          32768,
+	"gpt-4-1106-preview": 128000,
+	"gpt-4-turbo":        128000,
+	"gpt-4o":             128000,
+	"gpt-3.5-turbo":      16385,
+	"dummy-test":         100, // just for testing
 }
 
 var modelDateRe = regexp.MustCompile(`-\d{4}`)
diff --git a/command/openai/tokens_test.go b/command/openai/tokens_test.go
@@ -14,15 +14,14 @@ func TestModels(t *testing.T) {
 		{"", 128000},
 		{"jolo", 128000},
 		{"gpt-4", 8192},
+		{"gpt-4o", 128000},
 		{"gpt-4-0613", 8192},
-		{"gpt-4-32k-0613", 32768},
-		{"gpt-3.5-turbo", 4096},
-		{"gpt-3.5-turbo-16k-0613", 16385},
+		{"gpt-3.5-turbo", 16385},
 	}
 
 	for _, testCase := range modelsTestCases {
 		actual := getMaxTokensForModel(testCase.input)
-		assert.Equal(t, testCase.expected, actual)
+		assert.Equal(t, testCase.expected, actual, "Model "+testCase.input)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"github.com/slack-go/slack"`
`16`	`16`	`)`
`17`	`17`
	`18`	`+// limit the number of exported messages (incl thread messages)`
`18`	`19`	`const limit = 3000`
`19`	`20`
`20`	`21`	`// NewExportCommand is a constructor to create a new export command`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,14 @@ func TestModels(t *testing.T) {`
`14`	`14`	`{"", 128000},`
`15`	`15`	`{"jolo", 128000},`
`16`	`16`	`{"gpt-4", 8192},`
	`17`	`+ {"gpt-4o", 128000},`
`17`	`18`	`{"gpt-4-0613", 8192},`
`18`		`- {"gpt-4-32k-0613", 32768},`
`19`		`- {"gpt-3.5-turbo", 4096},`
`20`		`- {"gpt-3.5-turbo-16k-0613", 16385},`
	`19`	`+ {"gpt-3.5-turbo", 16385},`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`for _, testCase := range modelsTestCases {`
`24`	`23`	`actual := getMaxTokensForModel(testCase.input)`
`25`		`- assert.Equal(t, testCase.expected, actual)`
	`24`	`+ assert.Equal(t, testCase.expected, actual, "Model "+testCase.input)`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`