Skip to content

fix(settings): defer models import to prevent NameError after model config migration #1295

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

Closed
Krashnicov wants to merge 1 commit into from
Closed

fix(settings): defer models import to prevent NameError after model config migration #1295

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
4 changes: 3 additions & 1 deletion helpers/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import subprocess
from typing import Any, Literal, TypedDict, cast, TypeVar

import models
from helpers import runtime, whisper, defer, git, subagents
from . import files, dotenv
from helpers.print_style import PrintStyle
Expand Down Expand Up @@ -185,6 +184,7 @@ def _ensure_option_present(options: list[OptionT] | None, current_value: str | N
return opts

def convert_out(settings: Settings) -> SettingsOutput:
import models # deferred to avoid circular import with models.py
out = SettingsOutput(
settings = settings.copy(),
additional = SettingsOutputAdditional(
Expand Down Expand Up @@ -267,6 +267,7 @@ def convert_out(settings: Settings) -> SettingsOutput:
return out

def _get_api_key_field(settings: Settings, provider: str, title: str) -> SettingsField:
import models # deferred to avoid circular import with models.py
key = settings["api_keys"].get(provider, models.get_api_key(provider))
# For API keys, use simple asterisk placeholder for existing keys
return {
Expand Down Expand Up @@ -376,6 +377,7 @@ def _adjust_to_version(settings: Settings, default: Settings):


def _load_sensitive_settings(settings: Settings):
import models # deferred to avoid circular import with models.py
# load api keys from .env
providers = get_providers("chat") + get_providers("embedding")
for provider in providers:
Expand Down