d17ac794fd
* Centralize filesystem paths in a single module Add paths.py, which resolves the repo root once and derives the cache, accounts DB, logs, templates, frontend and bundled-city-data locations from it. Replace the 13 per-module `dirname(__file__)/..` anchors with references to it, so a module's location no longer determines where the app reads its data. Env overrides (accounts DB, VAPID, IndexNow) are unchanged; every resolved path is byte-identical to before. Groundwork for moving modules into packages without re-pointing paths. Claude-Session: https://claude.ai/code/session_01XXxmNFy9cZ6Gh8Y9thZn62 * Split the backend into domain packages Group the flat backend modules into packages that mirror their concerns: data/ climate, grading, scoring, grid, places, cities, city_events, store web/ app, views, homepage, content, schemas notifications/ notify, digest, push, mailer, discord, discord_interactions, discord_link accounts/ models, users, api_accounts, db core/ metrics, singleton, audit Intra-project imports are rewritten to the package-qualified form. The entry scripts (indexnow, warm_cities, migrate, gen_cities, gen_flavor) and paths.py stay at the backend/ root, and backend/app.py becomes a shim re-exporting web.app:app so the launch target stays `app:app` — run.sh, the systemd units, and CI need no change. Verified: full suite (318) passes, `uvicorn app:app` boots and serves the home/SEO/static/API surfaces, and every root script imports clean. Claude-Session: https://claude.ai/code/session_01XXxmNFy9cZ6Gh8Y9thZn62
134 lines
3.5 KiB
Python
134 lines
3.5 KiB
Python
"""Pydantic request/response models for accounts, subscriptions, notifications.
|
|
|
|
The User* schemas are fastapi-users' base schemas extended with display_name; the
|
|
Subscription*/Notification* models are the app's first request bodies and shape the
|
|
JSON the frontend sends and receives.
|
|
"""
|
|
import uuid
|
|
from typing import Literal
|
|
|
|
from fastapi_users import schemas
|
|
from pydantic import BaseModel, Field, field_validator
|
|
|
|
from data import grading
|
|
|
|
# Canonical metric keys a subscription may watch (kept in lockstep with grading).
|
|
ALLOWED_METRICS = tuple(grading.CLIMO_METRICS)
|
|
DEFAULT_METRICS = ["tmax", "feels", "precip"]
|
|
|
|
|
|
# --- users (fastapi-users) ---------------------------------------------------
|
|
class UserRead(schemas.BaseUser[uuid.UUID]):
|
|
display_name: str | None = None
|
|
# Present so the frontend can show linked/unlinked state; set via the OAuth
|
|
# flow (discord_link.py), not editable through the profile.
|
|
discord_id: str | None = None
|
|
discord_dm: bool = False
|
|
|
|
|
|
class UserCreate(schemas.BaseUserCreate):
|
|
display_name: str | None = None
|
|
|
|
|
|
class UserUpdate(schemas.BaseUserUpdate):
|
|
display_name: str | None = None
|
|
|
|
|
|
# --- subscriptions -----------------------------------------------------------
|
|
def _check_metrics(v: list[str]) -> list[str]:
|
|
if not v:
|
|
raise ValueError("pick at least one metric")
|
|
bad = [m for m in v if m not in ALLOWED_METRICS]
|
|
if bad:
|
|
raise ValueError(f"unknown metric(s): {', '.join(bad)}")
|
|
# de-dupe, preserve order
|
|
seen, out = set(), []
|
|
for m in v:
|
|
if m not in seen:
|
|
seen.add(m)
|
|
out.append(m)
|
|
return out
|
|
|
|
|
|
class SubscriptionIn(BaseModel):
|
|
lat: float = Field(ge=-90, le=90)
|
|
lon: float = Field(ge=-180, le=180)
|
|
label: str | None = None
|
|
threshold: int = Field(ge=95, le=99)
|
|
metrics: list[str] = Field(default_factory=lambda: list(DEFAULT_METRICS))
|
|
kind: Literal["observed", "forecast"] = "observed"
|
|
two_sided: bool = True
|
|
|
|
@field_validator("metrics")
|
|
@classmethod
|
|
def _metrics(cls, v):
|
|
return _check_metrics(v)
|
|
|
|
|
|
class SubscriptionPatch(BaseModel):
|
|
threshold: int | None = Field(default=None, ge=95, le=99)
|
|
metrics: list[str] | None = None
|
|
two_sided: bool | None = None
|
|
active: bool | None = None
|
|
|
|
@field_validator("metrics")
|
|
@classmethod
|
|
def _metrics(cls, v):
|
|
return _check_metrics(v) if v is not None else v
|
|
|
|
|
|
class SubscriptionOut(BaseModel):
|
|
id: int
|
|
cell_id: str
|
|
label: str | None
|
|
lat: float
|
|
lon: float
|
|
threshold: int
|
|
metrics: list[str]
|
|
kind: str
|
|
two_sided: bool
|
|
active: bool
|
|
last_notified_at: float | None
|
|
created_at: float
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
# --- notifications -----------------------------------------------------------
|
|
class NotificationOut(BaseModel):
|
|
id: int
|
|
subscription_id: int
|
|
event_date: str
|
|
metric: str
|
|
direction: str
|
|
kind: str
|
|
percentile: float
|
|
value: float | None
|
|
grade: str | None
|
|
title: str
|
|
body: str | None
|
|
created_at: float
|
|
read_at: float | None
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class NotificationList(BaseModel):
|
|
notifications: list[NotificationOut]
|
|
unread_count: int
|
|
|
|
|
|
# --- web push ----------------------------------------------------------------
|
|
class PushKeys(BaseModel):
|
|
p256dh: str
|
|
auth: str
|
|
|
|
|
|
class PushSubscriptionIn(BaseModel):
|
|
"""Matches the browser's PushSubscription.toJSON() shape."""
|
|
endpoint: str
|
|
keys: PushKeys
|
|
|
|
|
|
class PushUnsubscribeIn(BaseModel):
|
|
endpoint: str
|