Add GUI settings panel for API keys, model presets, and embedding model
- Add a password-protected /api/settings endpoint (HTTP Basic auth, backend/app/core/auth.py) backed by a DB-stored allowlist of connection settings (OPENAI_API_KEY, ANTHROPIC_API_KEY, AWS creds, OLLAMA_API_BASE, TAVILY_API_KEY, LOCAL_KB_EMBEDDING_MODEL). Saved values override .env and apply immediately via os.environ, so Lightsail deployments no longer need SSH + `.env` edits to rotate keys. Values are always returned masked to the frontend. - Replace ModelSelector.vue's hardcoded model list with a DB-backed /api/models CRUD API (read is public, writes reuse the settings password) so the chat model dropdown can be edited from the GUI; seed it once with the previous hardcoded presets on first boot. - Fix local_knowledge.py reading LOCAL_KB_EMBEDDING_MODEL once at import time instead of per-call, which would have silently ignored GUI/DB overrides for the embedding model. - Add SettingsPanel.vue (API keys + model management UI) and document the new SETTINGS_PASSWORD env var in .env.example and the Lightsail deploy guide. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,67 @@
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import Session as DBSession
|
||||
|
||||
from app.core.auth import require_settings_password
|
||||
from app.db.database import get_db
|
||||
from app.db.models import ModelPreset
|
||||
|
||||
router = APIRouter(prefix="/api/models", tags=["models"])
|
||||
|
||||
|
||||
class ModelPresetResponse(BaseModel):
|
||||
id: int
|
||||
label: str
|
||||
value: str
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
class ModelPresetRequest(BaseModel):
|
||||
label: str
|
||||
value: str
|
||||
|
||||
|
||||
@router.get("", response_model=list[ModelPresetResponse])
|
||||
def list_model_presets(db: DBSession = Depends(get_db)):
|
||||
"""モデル選択プルダウンの表示に使うため認証不要(誰でも読める)。"""
|
||||
return db.query(ModelPreset).order_by(ModelPreset.id).all()
|
||||
|
||||
|
||||
@router.post("", response_model=ModelPresetResponse, dependencies=[Depends(require_settings_password)])
|
||||
def create_model_preset(req: ModelPresetRequest, db: DBSession = Depends(get_db)):
|
||||
preset = ModelPreset(label=req.label, value=req.value)
|
||||
db.add(preset)
|
||||
try:
|
||||
db.commit()
|
||||
except IntegrityError as e:
|
||||
db.rollback()
|
||||
raise HTTPException(status_code=400, detail=f"モデル文字列が重複しています: {req.value}") from e
|
||||
db.refresh(preset)
|
||||
return preset
|
||||
|
||||
|
||||
@router.put("/{preset_id}", response_model=ModelPresetResponse, dependencies=[Depends(require_settings_password)])
|
||||
def update_model_preset(preset_id: int, req: ModelPresetRequest, db: DBSession = Depends(get_db)):
|
||||
preset = db.get(ModelPreset, preset_id)
|
||||
if not preset:
|
||||
raise HTTPException(status_code=404, detail="Model preset not found")
|
||||
preset.label = req.label
|
||||
preset.value = req.value
|
||||
try:
|
||||
db.commit()
|
||||
except IntegrityError as e:
|
||||
db.rollback()
|
||||
raise HTTPException(status_code=400, detail=f"モデル文字列が重複しています: {req.value}") from e
|
||||
db.refresh(preset)
|
||||
return preset
|
||||
|
||||
|
||||
@router.delete("/{preset_id}", status_code=204, dependencies=[Depends(require_settings_password)])
|
||||
def delete_model_preset(preset_id: int, db: DBSession = Depends(get_db)):
|
||||
preset = db.get(ModelPreset, preset_id)
|
||||
if preset:
|
||||
db.delete(preset)
|
||||
db.commit()
|
||||
@@ -0,0 +1,46 @@
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.orm import Session as DBSession
|
||||
|
||||
from app.core import settings_store
|
||||
from app.core.auth import require_settings_password
|
||||
from app.db.database import get_db
|
||||
|
||||
router = APIRouter(prefix="/api/settings", tags=["settings"], dependencies=[Depends(require_settings_password)])
|
||||
|
||||
|
||||
class SettingEntry(BaseModel):
|
||||
key: str
|
||||
is_set: bool
|
||||
masked: str | None
|
||||
overridden: bool
|
||||
|
||||
|
||||
class SaveSettingsRequest(BaseModel):
|
||||
values: dict[str, str]
|
||||
|
||||
|
||||
@router.get("", response_model=list[SettingEntry])
|
||||
def list_settings(db: DBSession = Depends(get_db)):
|
||||
return settings_store.list_masked(db)
|
||||
|
||||
|
||||
@router.put("", response_model=list[SettingEntry])
|
||||
def save_settings(req: SaveSettingsRequest, db: DBSession = Depends(get_db)):
|
||||
try:
|
||||
for key, value in req.values.items():
|
||||
if not value:
|
||||
continue # 空欄は「変更なし」として無視する
|
||||
settings_store.save(db, key, value)
|
||||
except ValueError as e:
|
||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
||||
return settings_store.list_masked(db)
|
||||
|
||||
|
||||
@router.delete("/{key}", response_model=list[SettingEntry])
|
||||
def clear_setting(key: str, db: DBSession = Depends(get_db)):
|
||||
try:
|
||||
settings_store.clear(db, key)
|
||||
except ValueError as e:
|
||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
||||
return settings_store.list_masked(db)
|
||||
@@ -0,0 +1,23 @@
|
||||
import secrets
|
||||
|
||||
from fastapi import Depends, HTTPException
|
||||
from fastapi.security import HTTPBasic, HTTPBasicCredentials
|
||||
|
||||
from app.core.config import SETTINGS_PASSWORD
|
||||
|
||||
_security = HTTPBasic()
|
||||
|
||||
|
||||
def require_settings_password(credentials: HTTPBasicCredentials = Depends(_security)) -> None:
|
||||
"""設定画面(/api/settings)専用の簡易パスワード認証。ユーザー名は見ない。
|
||||
|
||||
SETTINGS_PASSWORD が未設定の場合は、空パスワードでの突破を防ぐため常に拒否する。
|
||||
"""
|
||||
if not SETTINGS_PASSWORD:
|
||||
raise HTTPException(status_code=403, detail="SETTINGS_PASSWORD is not configured on the server")
|
||||
if not secrets.compare_digest(credentials.password, SETTINGS_PASSWORD):
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail="Invalid password",
|
||||
headers={"WWW-Authenticate": "Basic"},
|
||||
)
|
||||
@@ -9,6 +9,9 @@ MEMORY_SUMMARIZE_THRESHOLD: int = int(os.getenv("MEMORY_SUMMARIZE_THRESHOLD", "2
|
||||
CORS_ORIGINS: list[str] = os.getenv("CORS_ORIGINS", "http://localhost:5173").split(",")
|
||||
DEBUG: bool = os.getenv("DEBUG", "false").lower() in ("1", "true", "yes")
|
||||
|
||||
# GUI設定画面(/api/settings)を保護する簡易パスワード。未設定の場合、設定画面は常に403で拒否する。
|
||||
SETTINGS_PASSWORD: str | None = os.getenv("SETTINGS_PASSWORD")
|
||||
|
||||
# メッセージへの自動タグ付けに使うモデル(未設定ならDEFAULT_MODELを使用)
|
||||
TAGGING_MODEL: str | None = os.getenv("TAGGING_MODEL")
|
||||
|
||||
|
||||
@@ -7,12 +7,13 @@ import hashlib
|
||||
import json
|
||||
import logging
|
||||
import math
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
from sqlalchemy.orm import Session as DBSession
|
||||
|
||||
from app.core import llm
|
||||
from app.core.config import LOCAL_KB_DIR, LOCAL_KB_EMBEDDING_MODEL, LOCAL_KB_MIN_SCORE, LOCAL_KB_TOP_K
|
||||
from app.core.config import LOCAL_KB_DIR, LOCAL_KB_MIN_SCORE, LOCAL_KB_TOP_K
|
||||
from app.db.models import KnowledgeEntry, LocalKnowledgeDoc
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -22,6 +23,11 @@ def _kb_dir() -> Path:
|
||||
return Path(LOCAL_KB_DIR)
|
||||
|
||||
|
||||
def _embedding_model() -> str:
|
||||
"""GUIの設定画面から実行時に変更できるよう、起動時定数ではなく都度 os.environ を見に行く。"""
|
||||
return os.environ.get("LOCAL_KB_EMBEDDING_MODEL", "text-embedding-3-small")
|
||||
|
||||
|
||||
def _hash(content: str) -> str:
|
||||
return hashlib.sha256(content.encode("utf-8")).hexdigest()
|
||||
|
||||
@@ -104,7 +110,7 @@ async def sync_local_kb(db: DBSession) -> None:
|
||||
continue
|
||||
|
||||
try:
|
||||
[embedding] = await llm.embed([content], model=LOCAL_KB_EMBEDDING_MODEL)
|
||||
[embedding] = await llm.embed([content], model=_embedding_model())
|
||||
except Exception:
|
||||
logger.exception("Failed to embed local knowledge file: %s", rel_path)
|
||||
continue
|
||||
@@ -142,7 +148,7 @@ async def get_local_kb_context(db: DBSession, query_text: str) -> str | None:
|
||||
return None
|
||||
|
||||
try:
|
||||
[query_embedding] = await llm.embed([query_text], model=LOCAL_KB_EMBEDDING_MODEL)
|
||||
[query_embedding] = await llm.embed([query_text], model=_embedding_model())
|
||||
except Exception:
|
||||
logger.exception("Failed to embed query for local knowledge search")
|
||||
return None
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
import os
|
||||
|
||||
from sqlalchemy.orm import Session as DBSession
|
||||
|
||||
from app.db.models import AppSetting
|
||||
|
||||
# GUIから編集可能な環境変数の許可リスト。ここに無いキーは save()/clear() で拒否する。
|
||||
CONFIGURABLE_KEYS = [
|
||||
"OPENAI_API_KEY",
|
||||
"ANTHROPIC_API_KEY",
|
||||
"AWS_ACCESS_KEY_ID",
|
||||
"AWS_SECRET_ACCESS_KEY",
|
||||
"AWS_SESSION_TOKEN",
|
||||
"AWS_BEARER_TOKEN_BEDROCK",
|
||||
"AWS_REGION_NAME",
|
||||
"OLLAMA_API_BASE",
|
||||
"TAVILY_API_KEY",
|
||||
"LOCAL_KB_EMBEDDING_MODEL",
|
||||
]
|
||||
|
||||
# .env由来の起動時の値のスナップショット。clear() で戻す先として使う。
|
||||
_env_defaults: dict[str, str | None] = {}
|
||||
_snapshot_taken = False
|
||||
|
||||
|
||||
def _ensure_snapshot() -> None:
|
||||
global _snapshot_taken
|
||||
if _snapshot_taken:
|
||||
return
|
||||
for key in CONFIGURABLE_KEYS:
|
||||
_env_defaults[key] = os.environ.get(key)
|
||||
_snapshot_taken = True
|
||||
|
||||
|
||||
def _mask(value: str) -> str:
|
||||
if len(value) <= 4:
|
||||
return "••••"
|
||||
return f"••••{value[-4:]}"
|
||||
|
||||
|
||||
def load_into_env(db: DBSession) -> None:
|
||||
"""DBに保存済みの値をos.environに適用する。起動時に一度呼ぶ。"""
|
||||
_ensure_snapshot()
|
||||
for row in db.query(AppSetting).all():
|
||||
if row.key in CONFIGURABLE_KEYS:
|
||||
os.environ[row.key] = row.value
|
||||
|
||||
|
||||
def list_masked(db: DBSession) -> list[dict]:
|
||||
_ensure_snapshot()
|
||||
saved = {row.key: row.value for row in db.query(AppSetting).all()}
|
||||
result = []
|
||||
for key in CONFIGURABLE_KEYS:
|
||||
current = os.environ.get(key)
|
||||
result.append({
|
||||
"key": key,
|
||||
"is_set": bool(current),
|
||||
"masked": _mask(current) if current else None,
|
||||
"overridden": key in saved,
|
||||
})
|
||||
return result
|
||||
|
||||
|
||||
def save(db: DBSession, key: str, value: str) -> None:
|
||||
if key not in CONFIGURABLE_KEYS:
|
||||
raise ValueError(f"Unknown setting key: {key}")
|
||||
_ensure_snapshot()
|
||||
row = db.get(AppSetting, key)
|
||||
if row:
|
||||
row.value = value
|
||||
else:
|
||||
db.add(AppSetting(key=key, value=value))
|
||||
db.commit()
|
||||
os.environ[key] = value
|
||||
|
||||
|
||||
def clear(db: DBSession, key: str) -> None:
|
||||
if key not in CONFIGURABLE_KEYS:
|
||||
raise ValueError(f"Unknown setting key: {key}")
|
||||
_ensure_snapshot()
|
||||
row = db.get(AppSetting, key)
|
||||
if row:
|
||||
db.delete(row)
|
||||
db.commit()
|
||||
original = _env_defaults.get(key)
|
||||
if original is None:
|
||||
os.environ.pop(key, None)
|
||||
else:
|
||||
os.environ[key] = original
|
||||
@@ -104,6 +104,25 @@ class LocalKnowledgeDoc(Base):
|
||||
updated_at: Mapped[datetime] = mapped_column(DateTime, default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
|
||||
|
||||
|
||||
class AppSetting(Base):
|
||||
"""GUIの設定画面から編集する接続情報(APIキー等)。app.core.settings_store が読み書きする。"""
|
||||
__tablename__ = "app_settings"
|
||||
|
||||
key: Mapped[str] = mapped_column(String, primary_key=True)
|
||||
value: Mapped[str] = mapped_column(Text)
|
||||
updated_at: Mapped[datetime] = mapped_column(DateTime, default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
|
||||
|
||||
|
||||
class ModelPreset(Base):
|
||||
"""モデル選択プルダウン(ModelSelector.vue)に表示するプリセット。GUIの設定画面から編集する。"""
|
||||
__tablename__ = "model_presets"
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
|
||||
label: Mapped[str] = mapped_column(String)
|
||||
value: Mapped[str] = mapped_column(String, unique=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, default=lambda: datetime.now(timezone.utc))
|
||||
|
||||
|
||||
class ApiLog(Base):
|
||||
__tablename__ = "api_logs"
|
||||
|
||||
|
||||
+44
-2
@@ -4,13 +4,31 @@ from contextlib import asynccontextmanager
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
|
||||
from app.api import chat, logs, memory, system
|
||||
from app.api import models as models_api
|
||||
from app.api import settings as settings_api
|
||||
from app.core import settings_store
|
||||
from app.core.config import CORS_ORIGINS
|
||||
from app.core.discord.discord_bot import start_discord_bot
|
||||
from app.core.discord.scheduler import start_scheduler
|
||||
from app.core.memory_kb.word_memory import seed_from_history
|
||||
from app.db.database import SessionLocal, init_db
|
||||
from app.db.models import Message
|
||||
from app.api import chat, memory, logs, system
|
||||
from app.db.models import Message, ModelPreset
|
||||
|
||||
# ModelSelector.vue に元々ハードコードされていたプリセット。初回起動時のみDBへシードする。
|
||||
_DEFAULT_MODEL_PRESETS = [
|
||||
("GPT-5.5", "gpt-5.5"),
|
||||
("GPT-5.4", "gpt-5.4"),
|
||||
("GPT-5.4 mini", "gpt-5.4-mini"),
|
||||
("Claude Sonnet 4.6", "claude-sonnet-4-6"),
|
||||
("Claude Haiku 4.5", "claude-haiku-4-5-20251001"),
|
||||
("Ollama llama3", "ollama/llama3"),
|
||||
("Ollama Gemma4", "ollama/gemma4"),
|
||||
("Gemma 4 12B (llama-server)", "gpt-3.5-turbo"),
|
||||
("Claude Sonnet 4.6 (Bedrock)", "bedrock/jp.anthropic.claude-sonnet-4-6"),
|
||||
("Llama 3 70B (Bedrock)", "bedrock/meta.llama3-70b-instruct-v1:0"),
|
||||
("Nova 2 Lite (Bedrock)", "bedrock/jp.amazon.nova-2-lite-v1:0"),
|
||||
]
|
||||
|
||||
|
||||
def _seed_word_memory_from_db() -> None:
|
||||
@@ -28,9 +46,31 @@ def _seed_word_memory_from_db() -> None:
|
||||
db.close()
|
||||
|
||||
|
||||
def _load_settings_into_env() -> None:
|
||||
db = SessionLocal()
|
||||
try:
|
||||
settings_store.load_into_env(db)
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
def _seed_default_models() -> None:
|
||||
db = SessionLocal()
|
||||
try:
|
||||
if db.query(ModelPreset).first() is not None:
|
||||
return
|
||||
for label, value in _DEFAULT_MODEL_PRESETS:
|
||||
db.add(ModelPreset(label=label, value=value))
|
||||
db.commit()
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
init_db()
|
||||
_load_settings_into_env()
|
||||
_seed_default_models()
|
||||
_seed_word_memory_from_db()
|
||||
start_scheduler()
|
||||
asyncio.create_task(start_discord_bot())
|
||||
@@ -52,6 +92,8 @@ app.include_router(chat.router)
|
||||
app.include_router(memory.router)
|
||||
app.include_router(logs.router)
|
||||
app.include_router(system.router)
|
||||
app.include_router(settings_api.router)
|
||||
app.include_router(models_api.router)
|
||||
|
||||
|
||||
@app.get("/health")
|
||||
|
||||
Reference in New Issue
Block a user