Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avoid settings bleed #883

Merged
merged 1 commit into from
Mar 25, 2024
Merged

avoid settings bleed #883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/marvin/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ def __setattr__(self, name: str, value: Any) -> None:


class ChatCompletionSettings(MarvinSettings):
model_config = SettingsConfigDict(env_prefix="marvin_chat_completions_")
model_config = SettingsConfigDict(
env_prefix="marvin_chat_completions_", extra="ignore"
)
model: str = Field(
description="The default chat model to use.", default="gpt-4-1106-preview"
)
Expand All @@ -53,7 +55,7 @@ def encoder(self):


class ChatVisionSettings(MarvinSettings):
model_config = SettingsConfigDict(env_prefix="marvin_chat_vision_")
model_config = SettingsConfigDict(env_prefix="marvin_chat_vision_", extra="ignore")
model: str = Field(
description="The default vision model to use.", default="gpt-4-vision-preview"
)
Expand All @@ -68,6 +70,7 @@ def encoder(self):


class ChatSettings(MarvinSettings):
model_config = SettingsConfigDict(env_prefix="marvin_chat_", extra="ignore")
completions: ChatCompletionSettings = Field(default_factory=ChatCompletionSettings)
vision: ChatVisionSettings = Field(default_factory=ChatVisionSettings)

Expand All @@ -82,7 +85,7 @@ class ImageSettings(MarvinSettings):
style: The default style to use, defaults to `vivid`.
"""

model_config = SettingsConfigDict(env_prefix="marvin_image_")
model_config = SettingsConfigDict(env_prefix="marvin_image_", extra="ignore")

model: str = Field(
default="dall-e-3",
Expand Down Expand Up @@ -112,7 +115,10 @@ class SpeechSettings(MarvinSettings):
speed: The default speed to use, defaults to `1.0`.
"""

model_config = SettingsConfigDict(env_prefix="marvin_speech_")
model_config = SettingsConfigDict(
env_prefix="marvin_speech_",
extra="ignore",
)

model: str = Field(
default="tts-1-hd",
Expand Down Expand Up @@ -141,6 +147,10 @@ class AssistantSettings(MarvinSettings):


class AudioSettings(MarvinSettings):
"""Settings for the audio API."""

model_config = SettingsConfigDict(env_prefix="marvin_audio_", extra="ignore")

speech: SpeechSettings = Field(default_factory=SpeechSettings)


Expand Down Expand Up @@ -169,6 +179,7 @@ class OpenAISettings(MarvinSettings):

model_config = SettingsConfigDict(
env_prefix="marvin_openai_",
extra="ignore",
)

api_key: Optional[SecretStr] = Field(
Expand Down Expand Up @@ -201,11 +212,13 @@ def discover_api_key(cls, v):


class TextAISettings(MarvinSettings):
model_config = SettingsConfigDict(env_prefix="marvin_ai_text_")
model_config = SettingsConfigDict(env_prefix="marvin_ai_text_", extra="ignore")
generate_cache_token_cap: int = Field(600)


class AISettings(MarvinSettings):
model_config = SettingsConfigDict(env_prefix="marvin_ai_", extra="ignore")

text: TextAISettings = Field(default_factory=TextAISettings)


Expand Down