feat(review): S5 pricing rules + deterministic title/short desc + server-derived ready + Review UI
- backend/pricing.py: /admin/pricing CRUD (one flat $/bdft per species leaf, SETTINGS-35).
- backend/review.py: POST /slabs/{id}/review -> deterministic title + short description
(7 leaf patterns, length ft/in split, thickness 1/8-in precision, METADATA-80/85/90),
price suggestion (bdft x species rate, REVIEW-25), server-derived ready + missing set
(REVIEW-5).
- frontend: create/review/Review.svelte (slab id, primary category, price override,
ready state + generated copy) + dev toggle.
- tests: 3 pricing + 4 review tests (title no-dims, ready set, price suggestion,
knife-blank dims).
Verified: pytest 43 passed; gates exit 0; npm build ok.
This commit is contained in:
@@ -0,0 +1,183 @@
|
||||
"""Review to ready (S5): deterministic title/short description, price suggestion,
|
||||
and server-derived `ready` status. Cites REVIEW-5/10/15/20/25/30/40/45/50,
|
||||
METADATA-80/85/90, SETTINGS-35.
|
||||
"""
|
||||
|
||||
import json
|
||||
import re
|
||||
from typing import Any
|
||||
|
||||
from fastapi import APIRouter
|
||||
from fastapi.responses import JSONResponse
|
||||
|
||||
from .db import get_connection
|
||||
from .pricing import rate_for_species
|
||||
|
||||
router = APIRouter(prefix="/api/v1/slabs")
|
||||
|
||||
# Wood-category leaf slug -> (title pattern, noun, carries_dims).
|
||||
# Patterns interpolate {figure}, {species}, {length}, {width}, {thickness}, {bdft}.
|
||||
# Figure is Title-Case adjective; absent figure drops the slot.
|
||||
_LEAF_PATTERNS = {
|
||||
"live-edge-wood": ("{figure}{species} Live Edge Slab", "Live Edge Slab", False),
|
||||
"dimensional-wood": ("{figure}{species} {live_edge}Dimensional", "Dimensional", False),
|
||||
"knife-blanks": ("{figure}{species} Knife Blank ({dims})", "Knife Blank", True),
|
||||
"bowl-blanks": ("{figure}{species} {live_edge}Bowl Blank ({dims})", "Bowl Blank", True),
|
||||
"logs-and-caps": ("{figure}{species} Log Cap", "Log Cap", False),
|
||||
"pen-blanks": ("{figure}{species} Pen Blank ({dims})", "Pen Blank", True),
|
||||
"pepper-mill-blanks": ("{figure}{species} Pepper Mill Blank ({dims})", "Pepper Mill Blank", True),
|
||||
}
|
||||
|
||||
# Required fields for a slab to reach `ready` (REVIEW-5). Measurement fields
|
||||
# (widths/sqft/bdft) are read-only client math but must be present.
|
||||
_REQUIRED = [
|
||||
"sku", "length_in", "thickness_in", "sqft", "bdft",
|
||||
"width_min_in", "width_max_in", "width_avg_in",
|
||||
"species_id", "wood_category_ids", "edge_type_term_id",
|
||||
"grade_term_id", "thickness_term_id", "moisture_term_id",
|
||||
"price", "price_source", "title", "short_description", "description",
|
||||
"content_source",
|
||||
]
|
||||
|
||||
|
||||
def _error(code: str, message: str, detail: Any = None) -> dict:
|
||||
return {"error": {"code": code, "message": message, "detail": detail}}
|
||||
|
||||
|
||||
def _split_length(length_in: float) -> tuple[int, float]:
|
||||
ft = int(length_in // 12)
|
||||
rem = round(length_in - ft * 12, 1)
|
||||
return ft, rem
|
||||
|
||||
|
||||
def _fmt1(v: float) -> str:
|
||||
# 1 dp, trim trailing .0
|
||||
s = f"{v:.1f}"
|
||||
return s[:-2] if s.endswith(".0") else s
|
||||
|
||||
|
||||
def _fmt2(v: float) -> str:
|
||||
# 2 dp, trim trailing zeros (thickness carries 1/8-inch precision)
|
||||
s = f"{v:.2f}".rstrip("0").rstrip(".")
|
||||
return s
|
||||
|
||||
|
||||
def _dims(length_in: float, width_avg_in: float, thickness_in: float) -> str:
|
||||
return f"{_fmt1(length_in)} x {_fmt1(width_avg_in)} x {_fmt2(thickness_in)} in"
|
||||
|
||||
|
||||
def build_title(slab: dict, figure: str | None, species_name: str, primary_leaf: dict) -> str:
|
||||
pattern, noun, carries_dims = _LEAF_PATTERNS.get(
|
||||
primary_leaf.get("slug"), ("{figure}{species} Slab", "Slab", False)
|
||||
)
|
||||
figure = figure.strip() if figure else ""
|
||||
live_edge = ""
|
||||
if primary_leaf["slug"] in ("dimensional-wood", "bowl-blanks"):
|
||||
live_edge = "Live Edge " if slab.get("edge_type_term_id") else ""
|
||||
title = pattern.format(
|
||||
figure=figure + " " if figure else "",
|
||||
species=species_name,
|
||||
live_edge=live_edge,
|
||||
noun=noun,
|
||||
dims=_dims(slab["length_in"], slab["width_avg_in"], slab["thickness_in"]) if carries_dims else "",
|
||||
)
|
||||
return re.sub(r"\s+", " ", title).strip()
|
||||
|
||||
|
||||
def build_short_description(slab: dict, figure: str | None, species_name: str, primary_leaf: dict) -> str:
|
||||
title = build_title(slab, figure, species_name, primary_leaf)
|
||||
ft, rem = _split_length(slab["length_in"])
|
||||
length_str = f"{ft}ft {_fmt1(rem)}in"
|
||||
bdft = round(slab["bdft"], 1)
|
||||
line = f"{title}, {length_str} x {_fmt1(slab['width_avg_in'])}in x {_fmt2(slab['thickness_in'])}in, {_fmt1(bdft)} bdft"
|
||||
return re.sub(r"\s+", " ", line).strip()
|
||||
|
||||
|
||||
def _slab_dict(row) -> dict:
|
||||
d = dict(row)
|
||||
for f in ("wood_category_ids", "figure_term_ids", "fig_tag_ids", "feat_tag_ids"):
|
||||
if d.get(f) is not None and isinstance(d[f], str):
|
||||
try:
|
||||
d[f] = json.loads(d[f])
|
||||
except (ValueError, TypeError):
|
||||
d[f] = []
|
||||
return d
|
||||
|
||||
|
||||
def _taxonomy_lookup(conn):
|
||||
cats = {r["id"]: dict(r) for r in conn.execute("SELECT * FROM woo_categories").fetchall()}
|
||||
terms = {r["id"]: dict(r) for r in conn.execute("SELECT * FROM woo_attribute_terms").fetchall()}
|
||||
return cats, terms
|
||||
|
||||
|
||||
def missing_required(slab: dict) -> list[str]:
|
||||
return [f for f in _REQUIRED if slab.get(f) in (None, "", [])]
|
||||
|
||||
|
||||
def compute_ready(slab: dict) -> tuple[bool, list[str]]:
|
||||
missing = missing_required(slab)
|
||||
return (len(missing) == 0), missing
|
||||
|
||||
|
||||
def price_suggestion(conn, slab: dict) -> float | None:
|
||||
if not slab.get("species_id") or slab.get("bdft") is None:
|
||||
return None
|
||||
rate = rate_for_species(conn, slab["species_id"])
|
||||
if rate is None:
|
||||
return None
|
||||
return round(slab["bdft"] * rate, 2)
|
||||
|
||||
|
||||
@router.post("/{slab_id}/review")
|
||||
async def review_slab(slab_id: str, payload: dict[str, Any] | None = None) -> dict:
|
||||
payload = payload or {}
|
||||
conn = get_connection()
|
||||
row = conn.execute(
|
||||
"SELECT * FROM slabs WHERE id=? AND deleted_at IS NULL", (slab_id,)
|
||||
).fetchone()
|
||||
if row is None:
|
||||
return JSONResponse(status_code=404, content=_error("not_found", "Slab not found"))
|
||||
slab = _slab_dict(row)
|
||||
# Apply any review edits (primary category declaration + prose).
|
||||
editable = {"primary_wood_category_id", "title", "short_description", "description", "price", "price_source", "sku", "content_source"}
|
||||
for k in editable:
|
||||
if k in payload and payload[k] is not None:
|
||||
if k == "primary_wood_category_id":
|
||||
continue # not stored as a column; derived
|
||||
slab[k] = payload[k]
|
||||
cats, terms = _taxonomy_lookup(conn)
|
||||
# Primary wood category: declared, else first wood_category_ids, else first category.
|
||||
primary_id = payload.get("primary_wood_category_id")
|
||||
wood_cats = slab.get("wood_category_ids") or []
|
||||
if not primary_id:
|
||||
primary_id = wood_cats[0] if wood_cats else None
|
||||
primary_leaf = cats.get(primary_id, {})
|
||||
species_name = cats.get(slab.get("species_id"), {}).get("name", "")
|
||||
figure_term_ids = slab.get("figure_term_ids") or []
|
||||
figure = terms.get(figure_term_ids[0], {}).get("name") if figure_term_ids else None
|
||||
|
||||
# Deterministic copy (only if not already overridden by owner).
|
||||
if not payload.get("title"):
|
||||
if primary_leaf and species_name:
|
||||
slab["title"] = build_title(slab, figure, species_name, primary_leaf)
|
||||
if not payload.get("short_description"):
|
||||
if primary_leaf and species_name:
|
||||
slab["short_description"] = build_short_description(slab, figure, species_name, primary_leaf)
|
||||
# Price suggestion (REVIEW-25): bdft * species rate, empty if no rate; owner override sticks.
|
||||
suggested = price_suggestion(conn, slab)
|
||||
if payload.get("price") is not None:
|
||||
price = payload["price"]
|
||||
elif slab.get("price") not in (None, 0):
|
||||
price = slab["price"]
|
||||
else:
|
||||
price = suggested
|
||||
ready, missing = compute_ready({**slab, "price": price})
|
||||
return {
|
||||
"ready": ready,
|
||||
"missing": missing,
|
||||
"title": slab.get("title"),
|
||||
"short_description": slab.get("short_description"),
|
||||
"price": price,
|
||||
"price_suggestion": suggested,
|
||||
"primary_wood_category_id": primary_id,
|
||||
}
|
||||
Reference in New Issue
Block a user