diff --git a/pkg/openai/client.go b/pkg/openai/client.go index 526d4da6..d7a70d5b 100644 --- a/pkg/openai/client.go +++ b/pkg/openai/client.go @@ -20,7 +20,7 @@ import ( ) const ( - DefaultModel = openai.GPT4Turbo + DefaultModel = openai.GPT4o ) var ( @@ -45,7 +45,7 @@ type Options struct { APIVersion string `usage:"OpenAI API Version (for Azure)" name:"openai-api-version" env:"OPENAI_API_VERSION"` APIType openai.APIType `usage:"OpenAI API Type (valid: OPEN_AI, AZURE, AZURE_AD)" name:"openai-api-type" env:"OPENAI_API_TYPE"` OrgID string `usage:"OpenAI organization ID" name:"openai-org-id" env:"OPENAI_ORG_ID"` - DefaultModel string `usage:"Default LLM model to use" default:"gpt-4-turbo"` + DefaultModel string `usage:"Default LLM model to use" default:"gpt-4o"` ConfigFile string `usage:"Path to GPTScript config file" name:"config"` SetSeed bool `usage:"-"` CacheKey string `usage:"-"` diff --git a/pkg/tests/testdata/TestCase/call1.golden b/pkg/tests/testdata/TestCase/call1.golden index 0ed42d15..ef851a72 100644 --- a/pkg/tests/testdata/TestCase/call1.golden +++ b/pkg/tests/testdata/TestCase/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestCase2/call1.golden b/pkg/tests/testdata/TestCase2/call1.golden index d4998309..4b7b53f5 100644 --- a/pkg/tests/testdata/TestCase2/call1.golden +++ b/pkg/tests/testdata/TestCase2/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestChat/call1.golden b/pkg/tests/testdata/TestChat/call1.golden index 2f36d947..7e6c72d6 100644 --- a/pkg/tests/testdata/TestChat/call1.golden +++ b/pkg/tests/testdata/TestChat/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestChat/call2.golden b/pkg/tests/testdata/TestChat/call2.golden index 5a45cbfa..e81d33ca 100644 --- a/pkg/tests/testdata/TestChat/call2.golden +++ b/pkg/tests/testdata/TestChat/call2.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestChatRunNoError/call1.golden b/pkg/tests/testdata/TestChatRunNoError/call1.golden index d0b56407..17221df1 100644 --- a/pkg/tests/testdata/TestChatRunNoError/call1.golden +++ b/pkg/tests/testdata/TestChatRunNoError/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestContext/call1.golden b/pkg/tests/testdata/TestContext/call1.golden index 356c871a..71aca7cc 100644 --- a/pkg/tests/testdata/TestContext/call1.golden +++ b/pkg/tests/testdata/TestContext/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestContextArg/call1.golden b/pkg/tests/testdata/TestContextArg/call1.golden index e51539cc..3d6ac3a4 100644 --- a/pkg/tests/testdata/TestContextArg/call1.golden +++ b/pkg/tests/testdata/TestContextArg/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestContextSubChat/call1.golden b/pkg/tests/testdata/TestContextSubChat/call1.golden index 5bd16621..5c621512 100644 --- a/pkg/tests/testdata/TestContextSubChat/call1.golden +++ b/pkg/tests/testdata/TestContextSubChat/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/call10.golden b/pkg/tests/testdata/TestContextSubChat/call10.golden index 236dded1..5b6d8b04 100644 --- a/pkg/tests/testdata/TestContextSubChat/call10.golden +++ b/pkg/tests/testdata/TestContextSubChat/call10.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestContextSubChat/call2.golden b/pkg/tests/testdata/TestContextSubChat/call2.golden index 16cd2012..f7398a8f 100644 --- a/pkg/tests/testdata/TestContextSubChat/call2.golden +++ b/pkg/tests/testdata/TestContextSubChat/call2.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/call3.golden b/pkg/tests/testdata/TestContextSubChat/call3.golden index e46dae91..b4389d30 100644 --- a/pkg/tests/testdata/TestContextSubChat/call3.golden +++ b/pkg/tests/testdata/TestContextSubChat/call3.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/call4.golden b/pkg/tests/testdata/TestContextSubChat/call4.golden index 78de5261..ed86df2e 100644 --- a/pkg/tests/testdata/TestContextSubChat/call4.golden +++ b/pkg/tests/testdata/TestContextSubChat/call4.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/call5.golden b/pkg/tests/testdata/TestContextSubChat/call5.golden index ae69a80a..b2fbefa9 100644 --- a/pkg/tests/testdata/TestContextSubChat/call5.golden +++ b/pkg/tests/testdata/TestContextSubChat/call5.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestContextSubChat/call6.golden b/pkg/tests/testdata/TestContextSubChat/call6.golden index 5bd16621..5c621512 100644 --- a/pkg/tests/testdata/TestContextSubChat/call6.golden +++ b/pkg/tests/testdata/TestContextSubChat/call6.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/call7.golden b/pkg/tests/testdata/TestContextSubChat/call7.golden index 047255b3..b0696e50 100644 --- a/pkg/tests/testdata/TestContextSubChat/call7.golden +++ b/pkg/tests/testdata/TestContextSubChat/call7.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/call8.golden b/pkg/tests/testdata/TestContextSubChat/call8.golden index 3e9ec556..74084399 100644 --- a/pkg/tests/testdata/TestContextSubChat/call8.golden +++ b/pkg/tests/testdata/TestContextSubChat/call8.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/call9.golden b/pkg/tests/testdata/TestContextSubChat/call9.golden index 9572de06..c8823a9a 100644 --- a/pkg/tests/testdata/TestContextSubChat/call9.golden +++ b/pkg/tests/testdata/TestContextSubChat/call9.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/step1.golden b/pkg/tests/testdata/TestContextSubChat/step1.golden index 2c345ed1..1eb9ff36 100644 --- a/pkg/tests/testdata/TestContextSubChat/step1.golden +++ b/pkg/tests/testdata/TestContextSubChat/step1.golden @@ -7,7 +7,7 @@ "continuation": { "state": { "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { @@ -78,7 +78,7 @@ "state": { "input": "Input to chatbot1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/step2.golden b/pkg/tests/testdata/TestContextSubChat/step2.golden index 7394a502..8077e314 100644 --- a/pkg/tests/testdata/TestContextSubChat/step2.golden +++ b/pkg/tests/testdata/TestContextSubChat/step2.golden @@ -7,7 +7,7 @@ "state": { "input": "User 1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestContextSubChat/step3.golden b/pkg/tests/testdata/TestContextSubChat/step3.golden index 3d2dcf90..221a1804 100644 --- a/pkg/tests/testdata/TestContextSubChat/step3.golden +++ b/pkg/tests/testdata/TestContextSubChat/step3.golden @@ -7,7 +7,7 @@ "state": { "input": "User 1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ @@ -54,7 +54,7 @@ "continuation": { "state": { "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { @@ -125,7 +125,7 @@ "state": { "input": "Input to chatbot1 on resume", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestContextSubChat/step4.golden b/pkg/tests/testdata/TestContextSubChat/step4.golden index 6d975e1c..0f7d87fa 100644 --- a/pkg/tests/testdata/TestContextSubChat/step4.golden +++ b/pkg/tests/testdata/TestContextSubChat/step4.golden @@ -7,7 +7,7 @@ "state": { "input": "User 1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestCwd/call1.golden b/pkg/tests/testdata/TestCwd/call1.golden index f366cc42..188db091 100644 --- a/pkg/tests/testdata/TestCwd/call1.golden +++ b/pkg/tests/testdata/TestCwd/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestCwd/call2.golden b/pkg/tests/testdata/TestCwd/call2.golden index f61d473a..76a14ee8 100644 --- a/pkg/tests/testdata/TestCwd/call2.golden +++ b/pkg/tests/testdata/TestCwd/call2.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestCwd/call3.golden b/pkg/tests/testdata/TestCwd/call3.golden index 3e310b7e..92ebd472 100644 --- a/pkg/tests/testdata/TestCwd/call3.golden +++ b/pkg/tests/testdata/TestCwd/call3.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/call1.golden b/pkg/tests/testdata/TestDualSubChat/call1.golden index 852fe054..eef960bb 100644 --- a/pkg/tests/testdata/TestDualSubChat/call1.golden +++ b/pkg/tests/testdata/TestDualSubChat/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/call2.golden b/pkg/tests/testdata/TestDualSubChat/call2.golden index 16cd2012..f7398a8f 100644 --- a/pkg/tests/testdata/TestDualSubChat/call2.golden +++ b/pkg/tests/testdata/TestDualSubChat/call2.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/call3.golden b/pkg/tests/testdata/TestDualSubChat/call3.golden index 7ed7ae76..e211e8f2 100644 --- a/pkg/tests/testdata/TestDualSubChat/call3.golden +++ b/pkg/tests/testdata/TestDualSubChat/call3.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/call4.golden b/pkg/tests/testdata/TestDualSubChat/call4.golden index ab2aace9..7a0b9aa0 100644 --- a/pkg/tests/testdata/TestDualSubChat/call4.golden +++ b/pkg/tests/testdata/TestDualSubChat/call4.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/call5.golden b/pkg/tests/testdata/TestDualSubChat/call5.golden index 6b9cb0d8..1ce59fd6 100644 --- a/pkg/tests/testdata/TestDualSubChat/call5.golden +++ b/pkg/tests/testdata/TestDualSubChat/call5.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/call6.golden b/pkg/tests/testdata/TestDualSubChat/call6.golden index b9f6e3d3..dd8d25fb 100644 --- a/pkg/tests/testdata/TestDualSubChat/call6.golden +++ b/pkg/tests/testdata/TestDualSubChat/call6.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/call7.golden b/pkg/tests/testdata/TestDualSubChat/call7.golden index 31696c01..74a70c88 100644 --- a/pkg/tests/testdata/TestDualSubChat/call7.golden +++ b/pkg/tests/testdata/TestDualSubChat/call7.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/step1.golden b/pkg/tests/testdata/TestDualSubChat/step1.golden index ab54e4b8..db170513 100644 --- a/pkg/tests/testdata/TestDualSubChat/step1.golden +++ b/pkg/tests/testdata/TestDualSubChat/step1.golden @@ -7,7 +7,7 @@ "state": { "input": "User 1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { @@ -116,7 +116,7 @@ "state": { "input": "Input to chatbot1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { @@ -185,7 +185,7 @@ "state": { "input": "Input to chatbot2", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/step2.golden b/pkg/tests/testdata/TestDualSubChat/step2.golden index 3575765b..f09dd359 100644 --- a/pkg/tests/testdata/TestDualSubChat/step2.golden +++ b/pkg/tests/testdata/TestDualSubChat/step2.golden @@ -7,7 +7,7 @@ "state": { "input": "User 1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { @@ -123,7 +123,7 @@ "state": { "input": "Input to chatbot2", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestDualSubChat/step3.golden b/pkg/tests/testdata/TestDualSubChat/step3.golden index c25c1883..7faacef6 100644 --- a/pkg/tests/testdata/TestDualSubChat/step3.golden +++ b/pkg/tests/testdata/TestDualSubChat/step3.golden @@ -7,7 +7,7 @@ "state": { "input": "User 1", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { @@ -123,7 +123,7 @@ "state": { "input": "Input to chatbot2", "completion": { - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": [ { diff --git a/pkg/tests/testdata/TestExport/call1.golden b/pkg/tests/testdata/TestExport/call1.golden index 852208e0..ba7a6876 100644 --- a/pkg/tests/testdata/TestExport/call1.golden +++ b/pkg/tests/testdata/TestExport/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestExport/call2.golden b/pkg/tests/testdata/TestExport/call2.golden index 795c4dcd..c4ab9832 100644 --- a/pkg/tests/testdata/TestExport/call2.golden +++ b/pkg/tests/testdata/TestExport/call2.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestExport/call3.golden b/pkg/tests/testdata/TestExport/call3.golden index 16232d88..13f88a38 100644 --- a/pkg/tests/testdata/TestExport/call3.golden +++ b/pkg/tests/testdata/TestExport/call3.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestExportContext/call1.golden b/pkg/tests/testdata/TestExportContext/call1.golden index 20add018..026f573a 100644 --- a/pkg/tests/testdata/TestExportContext/call1.golden +++ b/pkg/tests/testdata/TestExportContext/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestSubChat/call1.golden b/pkg/tests/testdata/TestSubChat/call1.golden index 0fee8b2a..90198a04 100644 --- a/pkg/tests/testdata/TestSubChat/call1.golden +++ b/pkg/tests/testdata/TestSubChat/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ { diff --git a/pkg/tests/testdata/TestSubChat/call2.golden b/pkg/tests/testdata/TestSubChat/call2.golden index d0b56407..17221df1 100644 --- a/pkg/tests/testdata/TestSubChat/call2.golden +++ b/pkg/tests/testdata/TestSubChat/call2.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestSubChat/call3.golden b/pkg/tests/testdata/TestSubChat/call3.golden index 1b5dfd1a..13bab818 100644 --- a/pkg/tests/testdata/TestSubChat/call3.golden +++ b/pkg/tests/testdata/TestSubChat/call3.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": false, "Tools": null, "Messages": [ diff --git a/pkg/tests/testdata/TestToolAs/call1.golden b/pkg/tests/testdata/TestToolAs/call1.golden index 390abe3b..414d5b4d 100644 --- a/pkg/tests/testdata/TestToolAs/call1.golden +++ b/pkg/tests/testdata/TestToolAs/call1.golden @@ -1,5 +1,5 @@ `{ - "Model": "gpt-4-turbo", + "Model": "gpt-4o", "InternalSystemPrompt": null, "Tools": [ {