chore: change default model to gpt4o

ibuildthecloud · ibuildthecloud · commit 8ab40da81eb1 · 2024-05-15T10:54:59.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 `{
-  "Model": "gpt-4-turbo",
+  "Model": "gpt-4o",
   "InternalSystemPrompt": false,
   "Tools": null,
   "Messages": [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{
`2`		`- "Model": "gpt-4-turbo",`
	`2`	`+ "Model": "gpt-4o",`
`3`	`3`	`"InternalSystemPrompt": null,`
`4`	`4`	`"Tools": [`
`5`	`5`	`{`