chore: update default model to gpt-4-turbo

njhale · njhale · commit 94ee20b6cd29 · 2024-04-30T15:28:07.000-04:00
Update the default model to `gpt-4-turbo` (`gpt-4-turbo-2024-04-09`),
which is newer than the present default `gpt-4-turbo-preview`
(`gpt-4-0125-preview`).

Signed-off-by: Nick Hale &lt;4175918+njhale@users.noreply.github.com&gt;
diff --git a/README.md b/README.md
@@ -118,7 +118,7 @@ OUTPUT:
 Hello, World!
 ```
 
-The model used by default is `gpt-4-turbo-preview` and you must have access to that model in your OpenAI account.
+The model used by default is `gpt-4-turbo` and you must have access to that model in your OpenAI account.
 
 If using Azure OpenAI, make sure you configure the model to be one of the supported versions with the `--default-model` argument.
 
@@ -244,7 +244,7 @@ Tool parameters are key-value pairs defined at the beginning of a tool block, be
 | Key            | Description                                                                                                                             |
 |------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
 | `Name`           | The name of the tool.                                                                                                                   |
-| `Model Name`     | The OpenAI model to use, by default it uses "gpt-4-turbo-preview"                                                                         |
+| `Model Name`     | The OpenAI model to use, by default it uses "gpt-4-turbo"                                                                         |
 | `Description`    | The description of the tool. It is important that this properly describes the tool's purpose as the description is used by the LLM.     |
 | `Internal Prompt`| Setting this to `false` will disable the built-in system prompt for this tool.                                                          |
 | `Tools`          | A comma-separated list of tools that are available to be called by this tool.                                                            |
diff --git a/docs/docs/02-getting-started.md b/docs/docs/02-getting-started.md
@@ -59,7 +59,7 @@ OUTPUT:
 Hello, World!
 ```
 
-The model used by default is `gpt-4-turbo-preview` and you must have access to that model in your OpenAI account.
+The model used by default is `gpt-4-turbo` and you must have access to that model in your OpenAI account.
 
 If using Azure OpenAI, make sure you configure the model to be one of the supported versions with the `--default-model` argument.
 
diff --git a/docs/docs/07-gpt-file-reference.md b/docs/docs/07-gpt-file-reference.md
@@ -46,7 +46,7 @@ Tool parameters are key-value pairs defined at the beginning of a tool block, be
 | Key               | Description                                                                                                                                   |
 |-------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
 | `Name`            | The name of the tool.                                                                                                                         |
-| `Model Name`      | The OpenAI model to use, by default it uses "gpt-4-turbo-preview"                                                                             |
+| `Model Name`      | The OpenAI model to use, by default it uses "gpt-4-turbo"                                                                             |
 | `Description`     | The description of the tool. It is important that this properly describes the tool's purpose as the description is used by the LLM.           |
 | `Internal Prompt` | Setting this to `false` will disable the built-in system prompt for this tool.                                                                |
 | `Tools`           | A comma-separated list of tools that are available to be called by this tool.                                                                 |
diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go
@@ -237,7 +237,7 @@ func (r *GPTScript) PersistentPre(*cobra.Command, []string) error {
 		color.NoColor = !*r.Color
 	}
 
-	if r.DefaultModel != "gpt-4-turbo-preview" {
+	if r.DefaultModel != "gpt-4-turbo" {
 		log.Infof("WARNING: Changing the default model can have unknown behavior for existing tools. Use the model field per tool instead.")
 	}
 
diff --git a/pkg/loader/loader_test.go b/pkg/loader/loader_test.go
@@ -27,7 +27,7 @@ func TestHelloWorld(t *testing.T) {
   "entryToolId": "https://raw.githubusercontent.com/ibuildthecloud/test/bafe5a62174e8a0ea162277dcfe3a2ddb7eea928/example/sub/tool.gpt:1",
   "toolSet": {
     "https://raw.githubusercontent.com/ibuildthecloud/test/bafe5a62174e8a0ea162277dcfe3a2ddb7eea928/example/bob.gpt:1": {
-      "modelName": "gpt-4-turbo-preview",
+      "modelName": "gpt-4-turbo",
       "internalPrompt": null,
       "instructions": "Say hello world",
       "id": "https://raw.githubusercontent.com/ibuildthecloud/test/bafe5a62174e8a0ea162277dcfe3a2ddb7eea928/example/bob.gpt:1",
@@ -41,7 +41,7 @@ func TestHelloWorld(t *testing.T) {
       "workingDir": "https://raw.githubusercontent.com/ibuildthecloud/test/bafe5a62174e8a0ea162277dcfe3a2ddb7eea928/example"
     },
     "https://raw.githubusercontent.com/ibuildthecloud/test/bafe5a62174e8a0ea162277dcfe3a2ddb7eea928/example/sub/tool.gpt:1": {
-      "modelName": "gpt-4-turbo-preview",
+      "modelName": "gpt-4-turbo",
       "internalPrompt": null,
       "tools": [
         "../bob.gpt"
@@ -72,7 +72,7 @@ func TestHelloWorld(t *testing.T) {
   "toolSet": {
     "https://get.gptscript.ai/echo.gpt:1": {
       "description": "Returns back the input of the script",
-      "modelName": "gpt-4-turbo-preview",
+      "modelName": "gpt-4-turbo",
       "internalPrompt": null,
       "arguments": {
         "properties": {
diff --git a/pkg/openai/client.go b/pkg/openai/client.go
@@ -47,7 +47,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-preview"`
+	DefaultModel string         `usage:"Default LLM model to use" default:"gpt-4-turbo"`
 	ConfigFile   string         `usage:"Path to GPTScript config file" name:"config"`
 	SetSeed      bool           `usage:"-"`
 	CacheKey     string         `usage:"-"`

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ func (r GPTScript) PersistentPre(cobra.Command, []string) error {`
`237`	`237`	`color.NoColor = !*r.Color`
`238`	`238`	`}`
`239`	`239`
`240`		`- if r.DefaultModel != "gpt-4-turbo-preview" {`
	`240`	`+ if r.DefaultModel != "gpt-4-turbo" {`
`241`	`241`	`log.Infof("WARNING: Changing the default model can have unknown behavior for existing tools. Use the model field per tool instead.")`
`242`	`242`	`}`
`243`	`243`