mirror of
https://github.com/handsomezhuzhu/QQuiz.git
synced 2026-02-20 20:10:14 +00:00
feat: 实现数据库驱动的API配置管理和项目结构重组
## 新功能 - 实现管理后台API配置管理(OpenAI/Anthropic/Qwen) - API配置保存到数据库,实时生效无需重启 - API密钥遮罩显示(前10位+后4位) - 完整endpoint URL自动显示 ## 后端改进 - 新增 config_service.py 用于加载数据库配置 - LLMService 支持动态配置注入,回退到环境变量 - 更新 exam.py 和 question.py 使用数据库配置 - 扩展 schemas.py 支持所有API配置字段 ## 前端改进 - 重写 AdminSettings.jsx 增强UI体验 - API密钥显示/隐藏切换 - 当前使用的提供商可视化标识 - 移除"需要重启"的误导性提示 ## 项目结构重组 - 移动所有脚本到 scripts/ 目录 - 移动所有文档到 docs/ 目录 - 清理 Python 缓存文件 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -28,13 +28,24 @@ async def get_current_user(
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
print(f"🔍 Received token (first 50 chars): {token[:50] if token else 'None'}...")
|
||||
|
||||
# Decode token
|
||||
payload = decode_access_token(token)
|
||||
if payload is None:
|
||||
print(f"❌ Token decode failed - Invalid or expired token")
|
||||
raise credentials_exception
|
||||
|
||||
user_id: int = payload.get("sub")
|
||||
user_id = payload.get("sub")
|
||||
if user_id is None:
|
||||
print(f"❌ No 'sub' in payload: {payload}")
|
||||
raise credentials_exception
|
||||
|
||||
# Convert user_id to int if it's a string
|
||||
try:
|
||||
user_id = int(user_id)
|
||||
except (ValueError, TypeError):
|
||||
print(f"❌ Invalid user_id format: {user_id}")
|
||||
raise credentials_exception
|
||||
|
||||
# Get user from database
|
||||
@@ -42,8 +53,10 @@ async def get_current_user(
|
||||
user = result.scalar_one_or_none()
|
||||
|
||||
if user is None:
|
||||
print(f"❌ User not found with id: {user_id}")
|
||||
raise credentials_exception
|
||||
|
||||
print(f"✅ User authenticated: {user.username} (id={user.id})")
|
||||
return user
|
||||
|
||||
|
||||
|
||||
43
backend/services/config_service.py
Normal file
43
backend/services/config_service.py
Normal file
@@ -0,0 +1,43 @@
|
||||
"""
|
||||
Configuration Service - Load system configuration from database
|
||||
"""
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
from typing import Dict
|
||||
from models import SystemConfig
|
||||
|
||||
|
||||
async def load_llm_config(db: AsyncSession) -> Dict[str, str]:
|
||||
"""
|
||||
Load LLM configuration from database.
|
||||
|
||||
Returns a dictionary with all LLM-related configuration:
|
||||
{
|
||||
'ai_provider': 'openai',
|
||||
'openai_api_key': 'sk-...',
|
||||
'openai_base_url': 'https://api.openai.com/v1',
|
||||
'openai_model': 'gpt-4o-mini',
|
||||
...
|
||||
}
|
||||
"""
|
||||
# Fetch all config from database
|
||||
result = await db.execute(select(SystemConfig))
|
||||
db_configs = {config.key: config.value for config in result.scalars().all()}
|
||||
|
||||
# Build configuration dictionary
|
||||
config = {
|
||||
'ai_provider': db_configs.get('ai_provider', 'openai'),
|
||||
# OpenAI
|
||||
'openai_api_key': db_configs.get('openai_api_key'),
|
||||
'openai_base_url': db_configs.get('openai_base_url', 'https://api.openai.com/v1'),
|
||||
'openai_model': db_configs.get('openai_model', 'gpt-4o-mini'),
|
||||
# Anthropic
|
||||
'anthropic_api_key': db_configs.get('anthropic_api_key'),
|
||||
'anthropic_model': db_configs.get('anthropic_model', 'claude-3-haiku-20240307'),
|
||||
# Qwen
|
||||
'qwen_api_key': db_configs.get('qwen_api_key'),
|
||||
'qwen_base_url': db_configs.get('qwen_base_url', 'https://dashscope.aliyuncs.com/compatible-mode/v1'),
|
||||
'qwen_model': db_configs.get('qwen_model', 'qwen-plus')
|
||||
}
|
||||
|
||||
return config
|
||||
@@ -15,28 +15,53 @@ from utils import calculate_content_hash
|
||||
class LLMService:
|
||||
"""Service for interacting with various LLM providers"""
|
||||
|
||||
def __init__(self):
|
||||
self.provider = os.getenv("AI_PROVIDER", "openai")
|
||||
def __init__(self, config: Optional[Dict[str, str]] = None):
|
||||
"""
|
||||
Initialize LLM Service with optional configuration.
|
||||
If config is not provided, falls back to environment variables.
|
||||
|
||||
Args:
|
||||
config: Dictionary with keys like 'ai_provider', 'openai_api_key', etc.
|
||||
"""
|
||||
# Get provider from config or environment
|
||||
self.provider = (config or {}).get("ai_provider") or os.getenv("AI_PROVIDER", "openai")
|
||||
|
||||
if self.provider == "openai":
|
||||
api_key = (config or {}).get("openai_api_key") or os.getenv("OPENAI_API_KEY")
|
||||
base_url = (config or {}).get("openai_base_url") or os.getenv("OPENAI_BASE_URL", "https://api.openai.com/v1")
|
||||
self.model = (config or {}).get("openai_model") or os.getenv("OPENAI_MODEL", "gpt-4o-mini")
|
||||
|
||||
if not api_key:
|
||||
raise ValueError("OpenAI API key not configured")
|
||||
|
||||
self.client = AsyncOpenAI(
|
||||
api_key=os.getenv("OPENAI_API_KEY"),
|
||||
base_url=os.getenv("OPENAI_BASE_URL", "https://api.openai.com/v1")
|
||||
api_key=api_key,
|
||||
base_url=base_url
|
||||
)
|
||||
self.model = os.getenv("OPENAI_MODEL", "gpt-4o-mini")
|
||||
|
||||
elif self.provider == "anthropic":
|
||||
api_key = (config or {}).get("anthropic_api_key") or os.getenv("ANTHROPIC_API_KEY")
|
||||
self.model = (config or {}).get("anthropic_model") or os.getenv("ANTHROPIC_MODEL", "claude-3-haiku-20240307")
|
||||
|
||||
if not api_key:
|
||||
raise ValueError("Anthropic API key not configured")
|
||||
|
||||
self.client = AsyncAnthropic(
|
||||
api_key=os.getenv("ANTHROPIC_API_KEY")
|
||||
api_key=api_key
|
||||
)
|
||||
self.model = os.getenv("ANTHROPIC_MODEL", "claude-3-haiku-20240307")
|
||||
|
||||
elif self.provider == "qwen":
|
||||
api_key = (config or {}).get("qwen_api_key") or os.getenv("QWEN_API_KEY")
|
||||
base_url = (config or {}).get("qwen_base_url") or os.getenv("QWEN_BASE_URL", "https://dashscope.aliyuncs.com/compatible-mode/v1")
|
||||
self.model = (config or {}).get("qwen_model") or os.getenv("QWEN_MODEL", "qwen-plus")
|
||||
|
||||
if not api_key:
|
||||
raise ValueError("Qwen API key not configured")
|
||||
|
||||
self.client = AsyncOpenAI(
|
||||
api_key=os.getenv("QWEN_API_KEY"),
|
||||
base_url=os.getenv("QWEN_BASE_URL", "https://dashscope.aliyuncs.com/compatible-mode/v1")
|
||||
api_key=api_key,
|
||||
base_url=base_url
|
||||
)
|
||||
self.model = os.getenv("QWEN_MODEL", "qwen-plus")
|
||||
|
||||
else:
|
||||
raise ValueError(f"Unsupported AI provider: {self.provider}")
|
||||
|
||||
Reference in New Issue
Block a user