feat(config): default to WebSocket and migrate saved HTTP settings

This commit is contained in:
chenmingxuan committed 2026-11-04 17:45:52 +08:00
1 parent 2a3f43fb60
commit 04022f2eaf
18 files changed
+244 -58

No files matched your search

+64
View File
@@ -0,0 +1,64 @@
"""Atomic environment persistence and the one-time WebSocket default migration."""
import os
from pathlib import Path
import tempfile
from dotenv import dotenv_values
from filelock import FileLock
TRANSPORT_DEFAULT_VERSION_KEY = "ARTEMIS_TRANSPORT_DEFAULT_VERSION"
def _lock(path: Path) -> FileLock:
path.parent.mkdir(parents=True, exist_ok=True)
return FileLock(str(path) + ".artemis.lock", timeout=5)
def _write(path: Path, values: dict[str, str]) -> None:
original = path.read_text(encoding="utf-8") if path.exists() else ""
kept = [
line
for line in original.splitlines()
if line.strip().removeprefix("export ").split("=", 1)[0].strip() not in values
]
for key, value in values.items():
escaped = value.replace("\\", "\\\\").replace("'", "\\'")
kept.append(f"{key}='{escaped}'")
fd, temp_name = tempfile.mkstemp(prefix=".env-", dir=path.parent)
try:
with os.fdopen(fd, "w", encoding="utf-8", newline="\n") as stream:
stream.write("\n".join(kept) + "\n")
stream.flush()
os.fsync(stream.fileno())
os.replace(temp_name, path)
finally:
Path(temp_name).unlink(missing_ok=True)
def persist_environment(path: Path, values: dict[str, str]) -> None:
with _lock(path):
_write(path, values)
os.environ.update(values)
def _transport_default_is_current(path: Path) -> bool:
saved = dotenv_values(path, interpolate=False) if path.exists() else {}
try:
return int(saved.get(TRANSPORT_DEFAULT_VERSION_KEY) or "0") >= 1
except ValueError:
return False
def migrate_transport_default(path: Path) -> bool:
"""Migrate unversioned HTTP preferences once, preserving later opt-outs."""
# Completed migrations need no write access, including read-only deployments.
if _transport_default_is_current(path):
return False
with _lock(path):
if _transport_default_is_current(path):
return False
values = {"OPENAI_TRANSPORT": "websocket", TRANSPORT_DEFAULT_VERSION_KEY: "1"}
_write(path, values)
os.environ.update(values)
return True
+10 -3
View File
@@ -19,6 +19,7 @@ from pathlib import Path
from typing import Literal
from dotenv import load_dotenv
from filelock import Timeout
from pydantic import Field, SecretStr, model_validator
from pydantic_settings import BaseSettings
@@ -32,6 +33,7 @@ from artemis.config.constants import (
ENV_OPENAI_API_KEY,
ENV_VISION_API_KEY,
)
from artemis.config.environment import migrate_transport_default
from artemis.config.paths import (
GLOBAL_APP_DIR,
get_data_engine_db_path,
@@ -43,13 +45,18 @@ from artemis.utils.logger import get_logger
# Installed wheels load .env from the user directory, outside site-packages.
_canonical_env = get_env_file()
logger = get_logger(__name__)
try:
if migrate_transport_default(_canonical_env):
logger.info("已将全局模型传输协议迁移为 WebSocket;之后可在模型配置中切回 HTTP。")
except (OSError, Timeout):
os.environ["OPENAI_TRANSPORT"] = "websocket"
logger.warning("无法保存 WebSocket 默认迁移;本次使用 WebSocket,下次启动重试。")
load_dotenv(dotenv_path=_canonical_env, verbose=True)
_global_env = GLOBAL_APP_DIR / ".env"
if _global_env.exists() and _global_env.resolve() != _canonical_env.resolve():
load_dotenv(dotenv_path=_global_env, verbose=True)
logger = get_logger(__name__)
def is_placeholder_key(val: str | SecretStr | None) -> bool:
"""Check if an API credential is empty or an unconfigured placeholder value."""
@@ -110,7 +117,7 @@ class Settings(BaseSettings):
OPENAI_BASE_URL: str | None = "https://api-n-cd.playones.com/v1"
OPENAI_MODEL: str = Field(default=DEFAULT_MODEL, min_length=1)
OPENAI_TIMEOUT_SECONDS: float = Field(default=300.0, gt=0)
OPENAI_TRANSPORT: Literal["http", "websocket"] = "http"
OPENAI_TRANSPORT: Literal["http", "websocket"] = "websocket"
# Environment only; deliberately absent from the saved UI/task configuration.
OPENAI_USE_SYSTEM_PROXY: bool = False
OPENAI_MAX_RETRIES: int = Field(default=5, ge=0, le=10)
+1 -1
View File
@@ -2,7 +2,7 @@
{
"default": {
"provider": "openai",
"transport": "${env:OPENAI_TRANSPORT:-http}",
"transport": "${env:OPENAI_TRANSPORT:-websocket}",
"model": "${env:OPENAI_MODEL:-gpt-6-luna}",
"timeout": "${env:OPENAI_TIMEOUT_SECONDS:-300}",
"max_retries": "${env:OPENAI_MAX_RETRIES:-5}",