Spaces:
Sleeping
Sleeping
Upload 3 files
Browse files- api/auth.py +2 -0
- api/database.py +69 -1
- api/main.py +45 -1
api/auth.py
CHANGED
|
@@ -55,6 +55,7 @@ class UserInfo(BaseModel):
|
|
| 55 |
username: str
|
| 56 |
email: str
|
| 57 |
created_at: str
|
|
|
|
| 58 |
|
| 59 |
|
| 60 |
# ββ Helpers βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
|
@@ -159,4 +160,5 @@ async def me(current_user: dict = Depends(get_current_user)):
|
|
| 159 |
username=current_user["username"],
|
| 160 |
email=current_user["email"],
|
| 161 |
created_at=current_user["created_at"],
|
|
|
|
| 162 |
)
|
|
|
|
| 55 |
username: str
|
| 56 |
email: str
|
| 57 |
created_at: str
|
| 58 |
+
is_admin: bool = False
|
| 59 |
|
| 60 |
|
| 61 |
# ββ Helpers βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
|
|
|
| 160 |
username=current_user["username"],
|
| 161 |
email=current_user["email"],
|
| 162 |
created_at=current_user["created_at"],
|
| 163 |
+
is_admin=bool(current_user.get("is_admin", 0)),
|
| 164 |
)
|
api/database.py
CHANGED
|
@@ -54,8 +54,11 @@ def init_db() -> None:
|
|
| 54 |
username TEXT NOT NULL UNIQUE COLLATE NOCASE,
|
| 55 |
email TEXT NOT NULL UNIQUE COLLATE NOCASE,
|
| 56 |
password_hash TEXT NOT NULL,
|
| 57 |
-
created_at TEXT NOT NULL
|
|
|
|
| 58 |
);
|
|
|
|
|
|
|
| 59 |
|
| 60 |
CREATE TABLE IF NOT EXISTS chat_sessions (
|
| 61 |
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
@@ -231,3 +234,68 @@ def get_message_count(session_uuid: str) -> int:
|
|
| 231 |
"SELECT COUNT(*) as n FROM messages WHERE session_uuid=?", (session_uuid,)
|
| 232 |
).fetchone()
|
| 233 |
return row["n"] if row else 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 54 |
username TEXT NOT NULL UNIQUE COLLATE NOCASE,
|
| 55 |
email TEXT NOT NULL UNIQUE COLLATE NOCASE,
|
| 56 |
password_hash TEXT NOT NULL,
|
| 57 |
+
created_at TEXT NOT NULL,
|
| 58 |
+
is_admin INTEGER NOT NULL DEFAULT 0
|
| 59 |
);
|
| 60 |
+
-- Add is_admin column if upgrading from older schema
|
| 61 |
+
-- (safe to run multiple times β ALTER TABLE fails silently via Python)
|
| 62 |
|
| 63 |
CREATE TABLE IF NOT EXISTS chat_sessions (
|
| 64 |
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
|
|
| 234 |
"SELECT COUNT(*) as n FROM messages WHERE session_uuid=?", (session_uuid,)
|
| 235 |
).fetchone()
|
| 236 |
return row["n"] if row else 0
|
| 237 |
+
|
| 238 |
+
|
| 239 |
+
# ββ Admin helpers βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
| 240 |
+
|
| 241 |
+
def migrate_add_admin_column() -> None:
|
| 242 |
+
"""Safe migration β adds is_admin column to existing databases."""
|
| 243 |
+
try:
|
| 244 |
+
with get_conn() as conn:
|
| 245 |
+
conn.execute("ALTER TABLE users ADD COLUMN is_admin INTEGER NOT NULL DEFAULT 0")
|
| 246 |
+
except Exception:
|
| 247 |
+
pass # Column already exists β safe to ignore
|
| 248 |
+
|
| 249 |
+
|
| 250 |
+
def set_admin(username: str, is_admin: bool = True) -> bool:
|
| 251 |
+
"""Grant or revoke admin access for a user."""
|
| 252 |
+
with get_conn() as conn:
|
| 253 |
+
cur = conn.execute(
|
| 254 |
+
"UPDATE users SET is_admin=? WHERE username=? COLLATE NOCASE",
|
| 255 |
+
(1 if is_admin else 0, username)
|
| 256 |
+
)
|
| 257 |
+
return cur.rowcount > 0
|
| 258 |
+
|
| 259 |
+
|
| 260 |
+
def get_all_users_admin() -> list:
|
| 261 |
+
"""Return all users with session and message counts for admin panel."""
|
| 262 |
+
with get_conn() as conn:
|
| 263 |
+
rows = conn.execute("""
|
| 264 |
+
SELECT
|
| 265 |
+
u.id, u.username, u.email, u.created_at, u.is_admin,
|
| 266 |
+
COUNT(DISTINCT cs.id) AS session_count,
|
| 267 |
+
COUNT(DISTINCT m.id) AS message_count
|
| 268 |
+
FROM users u
|
| 269 |
+
LEFT JOIN chat_sessions cs ON cs.user_id = u.id AND cs.deleted_at IS NULL
|
| 270 |
+
LEFT JOIN messages m ON m.session_uuid = cs.session_uuid
|
| 271 |
+
GROUP BY u.id
|
| 272 |
+
ORDER BY u.created_at DESC
|
| 273 |
+
""").fetchall()
|
| 274 |
+
return [dict(r) for r in rows]
|
| 275 |
+
|
| 276 |
+
|
| 277 |
+
def get_all_sessions_admin() -> tuple:
|
| 278 |
+
"""Return total session and message counts across all users."""
|
| 279 |
+
with get_conn() as conn:
|
| 280 |
+
s = conn.execute("SELECT COUNT(*) FROM chat_sessions WHERE deleted_at IS NULL").fetchone()[0]
|
| 281 |
+
m = conn.execute("SELECT COUNT(*) FROM messages").fetchone()[0]
|
| 282 |
+
return s, m
|
| 283 |
+
|
| 284 |
+
|
| 285 |
+
def get_user_sessions_with_messages(user_id: int) -> list:
|
| 286 |
+
"""Return all sessions for a user including full message content."""
|
| 287 |
+
with get_conn() as conn:
|
| 288 |
+
sessions = conn.execute(
|
| 289 |
+
"SELECT * FROM chat_sessions WHERE user_id=? AND deleted_at IS NULL ORDER BY created_at DESC",
|
| 290 |
+
(user_id,)
|
| 291 |
+
).fetchall()
|
| 292 |
+
result = []
|
| 293 |
+
for s in sessions:
|
| 294 |
+
s = dict(s)
|
| 295 |
+
msgs = conn.execute(
|
| 296 |
+
"SELECT role, content, created_at FROM messages WHERE session_uuid=? ORDER BY id ASC",
|
| 297 |
+
(s["session_uuid"],)
|
| 298 |
+
).fetchall()
|
| 299 |
+
s["messages"] = [dict(m) for m in msgs]
|
| 300 |
+
result.append(s)
|
| 301 |
+
return result
|
api/main.py
CHANGED
|
@@ -65,9 +65,17 @@ async def lifespan(app: FastAPI):
|
|
| 65 |
logger.info("[NeuroCheck v9.0] spaCy model loaded: {}", model_path)
|
| 66 |
|
| 67 |
# Init persistent database
|
| 68 |
-
from api.database import init_db
|
| 69 |
init_db()
|
|
|
|
| 70 |
logger.info("[NeuroCheck] SQLite database initialized.")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
|
| 72 |
# Build RAG knowledge base (runs once, persists to disk)
|
| 73 |
try:
|
|
@@ -1244,6 +1252,42 @@ async def delete_session(
|
|
| 1244 |
return {"deleted": session_id}
|
| 1245 |
|
| 1246 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1247 |
# ββ Serve frontend static files βββββββββββββββββββββββββββββββββββββββββββββββ
|
| 1248 |
FRONTEND_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "frontend")
|
| 1249 |
|
|
|
|
| 65 |
logger.info("[NeuroCheck v9.0] spaCy model loaded: {}", model_path)
|
| 66 |
|
| 67 |
# Init persistent database
|
| 68 |
+
from api.database import init_db, migrate_add_admin_column, set_admin, get_user_by_username
|
| 69 |
init_db()
|
| 70 |
+
migrate_add_admin_column()
|
| 71 |
logger.info("[NeuroCheck] SQLite database initialized.")
|
| 72 |
+
# Auto-grant admin to ADMIN_USERNAME env var if set
|
| 73 |
+
admin_user = os.environ.get("ADMIN_USERNAME", "")
|
| 74 |
+
if admin_user:
|
| 75 |
+
u = get_user_by_username(admin_user)
|
| 76 |
+
if u and not u.get("is_admin"):
|
| 77 |
+
set_admin(admin_user, True)
|
| 78 |
+
logger.info("[NeuroCheck] Admin access granted to '{}'", admin_user)
|
| 79 |
|
| 80 |
# Build RAG knowledge base (runs once, persists to disk)
|
| 81 |
try:
|
|
|
|
| 1252 |
return {"deleted": session_id}
|
| 1253 |
|
| 1254 |
|
| 1255 |
+
# ββ Admin routes ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
| 1256 |
+
def require_admin(current_user: dict = Depends(__import__("api.auth", fromlist=["get_current_user"]).get_current_user)):
|
| 1257 |
+
if not current_user.get("is_admin"):
|
| 1258 |
+
raise HTTPException(status_code=403, detail="Admin access required")
|
| 1259 |
+
return current_user
|
| 1260 |
+
|
| 1261 |
+
|
| 1262 |
+
@app.get("/admin/users")
|
| 1263 |
+
async def admin_get_users(admin=Depends(require_admin)):
|
| 1264 |
+
"""Return all users with stats."""
|
| 1265 |
+
from api.database import get_all_users_admin, get_all_sessions_admin, migrate_add_admin_column
|
| 1266 |
+
migrate_add_admin_column()
|
| 1267 |
+
users = get_all_users_admin()
|
| 1268 |
+
total_sessions, total_messages = get_all_sessions_admin()
|
| 1269 |
+
return {
|
| 1270 |
+
"users": users,
|
| 1271 |
+
"total_sessions": total_sessions,
|
| 1272 |
+
"total_messages": total_messages,
|
| 1273 |
+
}
|
| 1274 |
+
|
| 1275 |
+
|
| 1276 |
+
@app.get("/admin/user/{user_id}/sessions")
|
| 1277 |
+
async def admin_get_user_sessions(user_id: int, admin=Depends(require_admin)):
|
| 1278 |
+
"""Return all sessions + full messages for a user."""
|
| 1279 |
+
from api.database import get_user_sessions_with_messages
|
| 1280 |
+
sessions = get_user_sessions_with_messages(user_id)
|
| 1281 |
+
return {"user_id": user_id, "sessions": sessions}
|
| 1282 |
+
|
| 1283 |
+
|
| 1284 |
+
@app.get("/admin")
|
| 1285 |
+
async def serve_admin():
|
| 1286 |
+
"""Serve the admin panel HTML."""
|
| 1287 |
+
admin_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "frontend", "admin.html")
|
| 1288 |
+
return FileResponse(admin_path)
|
| 1289 |
+
|
| 1290 |
+
|
| 1291 |
# ββ Serve frontend static files βββββββββββββββββββββββββββββββββββββββββββββββ
|
| 1292 |
FRONTEND_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "frontend")
|
| 1293 |
|