Merge pull request #925 from PrefectHQ/gpt-4o

Use gpt-4o by default
PrefectHQ · May 14, 2024 · 884d961 · 884d961
2 parents aedfb95 + a7070ea
commit 884d961
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/cookbook/_archive/docs_writer.py b/cookbook/_archive/docs_writer.py
@@ -7,7 +7,7 @@
 from marvin.beta.applications import Application
 
 # marvin.settings.log_level = "DEBUG"
-marvin.settings.openai.chat.completions.model = "gpt-4-1106-preview"
+marvin.settings.openai.chat.completions.model = "gpt-4o"
 
 
 ROOT_DIR = Path(marvin.__file__).parents[2]

diff --git a/cookbook/_archive/test_writing_application.py b/cookbook/_archive/test_writing_application.py
@@ -9,7 +9,7 @@
 from pydantic import BaseModel, Field
 
 marvin.settings.log_level = "DEBUG"
-marvin.settings.llm_model = "gpt-4"
+marvin.settings.llm_model = "gpt-4o"
 
 
 class TestWriterState(BaseModel):

diff --git a/cookbook/flows/github_digest/repo_activity.py b/cookbook/flows/github_digest/repo_activity.py
@@ -164,7 +164,7 @@ async def daily_github_digest(
         contributors_activity=await data_future.result(),
     )
 
-    marvin.settings.openai.chat.completions.model = "gpt-4"
+    marvin.settings.openai.chat.completions.model = "gpt-4o"
 
     epic_story = write_a_tasteful_epic(markdown_digest)
 

diff --git a/docs/docs/configuration/settings.md b/docs/docs/configuration/settings.md
@@ -11,7 +11,7 @@ Please set Marvin specific settings in `~/.marvin/.env`. One exception being `OP
     For example, in your `~/.marvin/.env` file you could have:
     ```shell
     MARVIN_LOG_LEVEL=INFO
-    MARVIN_CHAT_COMPLETIONS_MODEL=gpt-4
+    MARVIN_CHAT_COMPLETIONS_MODEL=gpt-4o
     MARVIN_OPENAI_API_KEY='sk-my-api-key'
     ```
     Settings these values will let you avoid setting an API key every time. 
@@ -24,7 +24,7 @@ A runtime settings object is accessible via `marvin.settings` and can be used to
     ```python
     import marvin
 
-    marvin.settings.openai.chat.completions.model = 'gpt-4'
+    marvin.settings.openai.chat.completions.model = 'gpt-4o'
     ```
 
 ## Settings for using Azure OpenAI models

diff --git a/src/marvin/settings.py b/src/marvin/settings.py
@@ -36,7 +36,7 @@ class ChatCompletionSettings(MarvinSettings):
     model_config = SettingsConfigDict(
         env_prefix="marvin_chat_completions_", extra="ignore"
     )
-    model: str = Field(description="The default chat model to use.", default="gpt-4")
+    model: str = Field(description="The default chat model to use.", default="gpt-4o")
 
     temperature: float = Field(description="The default temperature to use.", default=1)
 
@@ -117,13 +117,13 @@ class AssistantSettings(MarvinSettings):
     """Settings for the assistant API.
 
     Attributes:
-        model: The default assistant model to use, defaults to `gpt-4-1106-preview`.
+        model: The default assistant model to use
     """
 
     model_config = SettingsConfigDict(env_prefix="marvin_assistant_")
 
     model: str = Field(
-        default="gpt-4-1106-preview",
+        default="gpt-4o",
         description="The default assistant model to use.",
     )
 

diff --git a/src/marvin/utilities/testing.py b/src/marvin/utilities/testing.py
@@ -57,7 +57,7 @@ def assert_equal(
     assert result.is_equal, assert_msg
 
 
-@marvin.fn(model_kwargs=dict(model="gpt-4-1106-preview"))
+@marvin.fn(model_kwargs=dict(model="gpt-4o"))
 def _assert_equal(
     llm_output: Any, expected: Any, instructions: str = None
 ) -> Assertion:

diff --git a/tests/test_settings.py b/tests/test_settings.py
@@ -44,7 +44,7 @@ def test_speech_settings_default(self):
 class TestAssistantSettings:
     def test_assistant_settings_default(self):
         settings = AssistantSettings()
-        assert settings.model == "gpt-4-1106-preview"
+        assert settings.model == "gpt-4o"
 
 
 class TestTemporarySettings: