dtoro
348e9c3585
Introduce username/password authentication with admin and user roles.
Each user gets their own media directory under /photos/{username}/ with
isolated photos, folders, heaps, and tags. Admins manage users and
observe the full library from a dedicated Settings page.
Backend:
- User model with bcrypt passwords and JWT access/refresh tokens
- Auth router (login, refresh, setup, change-password, status)
- Admin router (user CRUD with last-admin protection)
- user_id FK added to photos, folders, source_roots, heaps, tags
- All data routers scoped by authenticated user
- Scanner inherits user_id from source root owner
- Thumbnails stored under user-prefixed paths for isolation
- Library endpoints accept ?scope=global for admin cross-user view
- Alembic migration 0009 with data migration for existing installs
- Defensive bootstrap.py handles fresh vs existing DB startup
Frontend:
- AuthContext with token lifecycle, auto-refresh, login/logout
- Login page, first-run setup page, auth gate in App.tsx
- Bearer token interceptor on all API requests
- User identity + logout in left sidebar
- Admin-only Settings page with Library Management and Users tabs
- UserManagement panel (add, edit role, reset password, deactivate)
- Settings shows global stats across all users for admin
- Filter bar, right sidebar, keyboard hints hidden on settings page
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
77 lines
2.3 KiB
Python
77 lines
2.3 KiB
Python
"""
|
|
Search API router — unified hybrid search endpoint.
|
|
"""
|
|
from typing import Optional
|
|
from fastapi import APIRouter, Depends
|
|
from pydantic import BaseModel
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy import select
|
|
|
|
from app.database import get_db
|
|
from app.models import Photo
|
|
from app.services.search import hybrid_search
|
|
from app.models.user import User
|
|
from app.dependencies import get_current_user
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
class SearchRequest(BaseModel):
|
|
q: Optional[str] = None
|
|
filters: Optional[dict] = None
|
|
limit: int = 50
|
|
offset: int = 0
|
|
|
|
|
|
@router.post("")
|
|
async def search_photos(body: SearchRequest, db: AsyncSession = Depends(get_db), current_user: User = Depends(get_current_user)):
|
|
"""Unified search endpoint. Every query runs hybrid (FTS + semantic)
|
|
by default — the user never picks a mode.
|
|
|
|
Filters:
|
|
- tag_ids: list of tag IDs (any kind: user, object, face_cluster)
|
|
- date_from / date_to: ISO date strings
|
|
"""
|
|
filters = body.filters or {}
|
|
|
|
results = await hybrid_search(
|
|
db=db,
|
|
q=body.q,
|
|
tag_ids=filters.get("tag_ids"),
|
|
date_from=filters.get("date_from"),
|
|
date_to=filters.get("date_to"),
|
|
limit=body.limit,
|
|
offset=body.offset,
|
|
)
|
|
|
|
if not results:
|
|
return {"results": [], "total": 0}
|
|
|
|
# Hydrate with photo data
|
|
photo_ids = [r["photo_id"] for r in results]
|
|
stmt = select(Photo).where(Photo.id.in_(photo_ids), Photo.user_id == current_user.id)
|
|
rows = (await db.execute(stmt)).scalars().all()
|
|
photo_map = {p.id: p for p in rows}
|
|
|
|
hydrated = []
|
|
for r in results:
|
|
photo = photo_map.get(r["photo_id"])
|
|
if not photo:
|
|
continue
|
|
hydrated.append({
|
|
"id": photo.id,
|
|
"filename": photo.filename,
|
|
"filepath": photo.filepath,
|
|
"media_type": photo.media_type,
|
|
"width": photo.width,
|
|
"height": photo.height,
|
|
"taken_at": photo.taken_at.isoformat() if photo.taken_at else None,
|
|
"rating": photo.rating,
|
|
"color_label": photo.color_label,
|
|
"thumb_small": photo.thumb_small,
|
|
"thumb_medium": photo.thumb_medium,
|
|
"score": r["score"],
|
|
})
|
|
|
|
return {"results": hydrated, "total": len(hydrated)}
|