优化鉴权系统

This commit is contained in:
2026-07-03 21:54:19 +08:00
parent 7e65fadd83
commit 98a92b83fa
11 changed files with 539 additions and 149 deletions
+6 -34
View File
@@ -1,8 +1,6 @@
from dataclasses import dataclass
import json
from pathlib import Path
import os
from uuid import UUID
from pathlib import Path
from dotenv import load_dotenv
@@ -15,7 +13,7 @@ class Settings:
model: str
default_system_prompt: str
data_dir: Path
api_key_whitelist: dict[str, str]
user_db_path: Path
max_tool_rounds: int = 5
max_tool_calls_per_turn: int = 10
tool_timeout_seconds: float = 5.0
@@ -23,6 +21,7 @@ class Settings:
@classmethod
def from_env(cls) -> "Settings":
load_dotenv(dotenv_path=Path.cwd() / ".env", override=False)
data_dir = Path(os.getenv("CHAT_DATA_DIR", "data"))
return cls(
port=int(os.getenv("SERVICE_PORT", "8000")),
api_key=os.getenv("DEEPSEEK_API_KEY"),
@@ -31,38 +30,11 @@ class Settings:
default_system_prompt=os.getenv(
"DEFAULT_SYSTEM_PROMPT", "You are a helpful assistant."
),
data_dir=Path(os.getenv("CHAT_DATA_DIR", "data")),
api_key_whitelist=_parse_api_key_whitelist(
os.getenv("API_KEY_WHITELIST", "{}")
),
data_dir=data_dir,
user_db_path=Path(os.getenv("USER_DB_PATH", str(data_dir / "users.db"))),
max_tool_rounds=int(os.getenv("MAX_TOOL_ROUNDS", "5")),
max_tool_calls_per_turn=int(
os.getenv("MAX_TOOL_CALLS_PER_TURN", "10")
),
tool_timeout_seconds=float(os.getenv("TOOL_TIMEOUT_SECONDS", "5")),
)
def _parse_api_key_whitelist(value: str) -> dict[str, str]:
try:
parsed = json.loads(value)
except json.JSONDecodeError as exc:
raise ValueError("API_KEY_WHITELIST must be valid JSON") from exc
if not isinstance(parsed, dict):
raise ValueError("API_KEY_WHITELIST must map user UUIDs to API keys")
normalized: dict[str, str] = {}
for user_id, api_key in parsed.items():
if not isinstance(user_id, str) or not isinstance(api_key, str) or not api_key:
raise ValueError("API_KEY_WHITELIST must map user UUIDs to API keys")
try:
normalized_user_id = str(UUID(user_id))
except ValueError as exc:
raise ValueError("API_KEY_WHITELIST user IDs must be valid UUIDs") from exc
if normalized_user_id in normalized:
raise ValueError("API_KEY_WHITELIST contains duplicate user UUIDs")
normalized[normalized_user_id] = api_key
if len(set(normalized.values())) != len(normalized):
raise ValueError("API keys in API_KEY_WHITELIST must be unique")
return normalized
)