676d976937
Phase 2 — SCAD editor on /holder
================================
Some adjustments need more control than the parameter form gives
(e.g. tweaking the .scad logic itself). A collapsible CodeMirror-based
editor now slides up from the bottom of the viewport when you click
the "</> Source" button at the bottom-right.
- holder.html / holder.css: editor panel, toggle button, Reset and
Close buttons. CodeMirror 5 loaded from cdnjs (single CSS + JS
pair, clike mode for syntax highlighting since OpenSCAD is C-like).
- holder-app.js: lazy-initialises the editor on first show, fetches
bundled source from /api/holder/source, tracks whether the editor
content has been modified ("modified" tag in the panel title).
When the editor is visible AND content differs from bundled,
_doRender() switches from /api/holder/render -> /api/scad/render
with {source, params}. Cell-count cap doesn't apply in that mode
(the source may not even use the holder schema).
Phase 3 — Universal OpenSCAD playground at /scad
================================================
A standalone page for rendering arbitrary OpenSCAD. Paste code, click
Render (or Ctrl+Enter), see STL in the same Three.js viewer the
holder uses. Useful for prototyping new generators before wiring
them into a parameter form.
- New page: static/scad.html + scad.css + js/scad-app.js. Reuses
holder-viewer.js (the Three.js scene module is generic enough).
- "Load example" populates a 6-hole rounded bracket so new users
can verify the renderer works in two clicks.
- Same progress UI (elapsed timer + indeterminate bar + Cancel
via AbortController) as /holder.
- Top nav now has Holder / Busbars / SCAD on every page.
Backend (shared by phase 2 & 3)
================================
- holder.py: split _run_openscad() out of render_stl(). New
render_source(source, params=None) writes the source to a temp
file and renders it; enforces MAX_SOURCE_BYTES (default 512 KB)
and RENDER_TIMEOUT but skips the cell-count cap. New bundled_source()
returns the hex_cell.scad text for editor pre-population.
- app.py: GET /api/holder/source returns the bundled .scad text.
POST /api/scad/render takes {source, params?} and returns STL +
X-Holder-Dimensions header. ValueError -> 400, RuntimeError -> 500.
_stl_response() factored out so both render endpoints emit the same
headers consistently.
286 lines
8.2 KiB
Python
286 lines
8.2 KiB
Python
"""Flask entrypoint for Busbar Designer.
|
|
|
|
Serves the static frontend, the /api/export/<fmt> CAD endpoints (build123d →
|
|
STEP/DXF/SVG), and the /api/projects, /api/presets, /api/snapshots persistence
|
|
endpoints (SQLite via storage.py).
|
|
|
|
Run:
|
|
python app.py
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import os
|
|
import sys
|
|
import traceback
|
|
|
|
from flask import Flask, Response, jsonify, request, send_from_directory
|
|
|
|
from busbar_export import WRITERS
|
|
import storage
|
|
import holder
|
|
|
|
APP_DIR = os.path.dirname(os.path.abspath(__file__))
|
|
STATIC_DIR = os.path.join(APP_DIR, "static")
|
|
|
|
app = Flask(__name__, static_folder=STATIC_DIR, static_url_path="")
|
|
|
|
storage.init_db()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Static + health
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@app.get("/")
|
|
def index():
|
|
return send_from_directory(STATIC_DIR, "index.html")
|
|
|
|
|
|
@app.get("/holder")
|
|
def holder_page():
|
|
return send_from_directory(STATIC_DIR, "holder.html")
|
|
|
|
|
|
@app.get("/scad")
|
|
def scad_page():
|
|
"""Universal OpenSCAD renderer (paste any source, get STL)."""
|
|
return send_from_directory(STATIC_DIR, "scad.html")
|
|
|
|
|
|
@app.get("/api/health")
|
|
def health():
|
|
return jsonify({"status": "ok", "openscad": holder.openscad_available()})
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Hex holder designer (OpenSCAD-backed)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@app.get("/api/holder/params")
|
|
def holder_params():
|
|
"""Schema for the parameter form + their defaults."""
|
|
return jsonify({
|
|
"params": holder.schema_dict(),
|
|
"defaults": holder.default_params(),
|
|
"max_cells": holder.MAX_CELLS,
|
|
})
|
|
|
|
|
|
def _stl_response(data: bytes, dims: dict, filename: str) -> Response:
|
|
return Response(
|
|
data,
|
|
mimetype="model/stl",
|
|
headers={
|
|
"Content-Disposition": f'attachment; filename="{filename}"',
|
|
"X-Holder-Dimensions": json.dumps(dims),
|
|
"Access-Control-Expose-Headers": "X-Holder-Dimensions",
|
|
},
|
|
)
|
|
|
|
|
|
@app.post("/api/holder/render")
|
|
def holder_render():
|
|
"""Render STL for the bundled hex holder with parameter overrides."""
|
|
body = request.get_json(silent=True) or {}
|
|
try:
|
|
data, dims = holder.render_stl(body.get("params", {}))
|
|
except ValueError as e:
|
|
return jsonify({"error": str(e)}), 400
|
|
except (FileNotFoundError, RuntimeError) as e:
|
|
return jsonify({"error": str(e)}), 500
|
|
return _stl_response(data, dims, "hex_holder.stl")
|
|
|
|
|
|
@app.get("/api/holder/source")
|
|
def holder_source():
|
|
"""Return the bundled hex_cell.scad text (for editor pre-population)."""
|
|
try:
|
|
return Response(holder.bundled_source(), mimetype="text/plain; charset=utf-8")
|
|
except FileNotFoundError as e:
|
|
return jsonify({"error": str(e)}), 500
|
|
|
|
|
|
@app.post("/api/scad/render")
|
|
def scad_render():
|
|
"""Render arbitrary user-supplied OpenSCAD source (no holder schema).
|
|
|
|
Body: {"source": "...", "params": {optional -D overrides}}
|
|
"""
|
|
body = request.get_json(silent=True) or {}
|
|
source = body.get("source")
|
|
params = body.get("params") # may be None
|
|
try:
|
|
data, dims = holder.render_source(source, params)
|
|
except ValueError as e:
|
|
return jsonify({"error": str(e)}), 400
|
|
except (FileNotFoundError, RuntimeError) as e:
|
|
return jsonify({"error": str(e)}), 500
|
|
return _stl_response(data, dims, "rendered.stl")
|
|
|
|
|
|
@app.post("/api/holder/cells")
|
|
def holder_cells():
|
|
"""Cell-center coordinates for the supplied parameters (no OpenSCAD needed)."""
|
|
body = request.get_json(silent=True) or {}
|
|
try:
|
|
cells = holder.compute_cells(body.get("params", {}))
|
|
except ValueError as e:
|
|
return jsonify({"error": str(e)}), 400
|
|
return jsonify({"cells": cells, "count": len(cells)})
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# CAD export (unchanged contract)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@app.post("/api/export/<fmt>")
|
|
def export(fmt: str):
|
|
fmt = fmt.lower()
|
|
if fmt not in WRITERS:
|
|
return jsonify({"error": f"unsupported format: {fmt}"}), 400
|
|
|
|
payload = request.get_json(silent=True) or {}
|
|
writer, mimetype, ext = WRITERS[fmt]
|
|
try:
|
|
data = writer(payload)
|
|
except ValueError as e:
|
|
return jsonify({"error": str(e)}), 400
|
|
except Exception as e:
|
|
traceback.print_exc()
|
|
return jsonify({"error": f"{type(e).__name__}: {e}"}), 500
|
|
|
|
filename = f"busbars.{ext}"
|
|
return Response(
|
|
data,
|
|
mimetype=mimetype,
|
|
headers={"Content-Disposition": f'attachment; filename="{filename}"'},
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Projects
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@app.get("/api/projects")
|
|
def projects_index():
|
|
return jsonify(storage.list_projects())
|
|
|
|
|
|
@app.post("/api/projects")
|
|
def projects_create():
|
|
body = request.get_json(silent=True) or {}
|
|
name = (body.get("name") or "Untitled").strip() or "Untitled"
|
|
data = body.get("data") or {}
|
|
pid = storage.create_project(name, data)
|
|
return jsonify({"id": pid, "name": name})
|
|
|
|
|
|
@app.get("/api/projects/<int:pid>")
|
|
def projects_show(pid: int):
|
|
p = storage.get_project(pid)
|
|
if p is None:
|
|
return jsonify({"error": "not found"}), 404
|
|
return jsonify(p)
|
|
|
|
|
|
@app.put("/api/projects/<int:pid>")
|
|
def projects_update(pid: int):
|
|
body = request.get_json(silent=True) or {}
|
|
ok = storage.update_project(
|
|
pid,
|
|
name=body.get("name"),
|
|
data=body.get("data"),
|
|
snapshot=bool(body.get("snapshot", False)),
|
|
note=body.get("note"),
|
|
)
|
|
if not ok:
|
|
return jsonify({"error": "not found"}), 404
|
|
return jsonify({"ok": True})
|
|
|
|
|
|
@app.delete("/api/projects/<int:pid>")
|
|
def projects_delete(pid: int):
|
|
storage.delete_project(pid)
|
|
return jsonify({"ok": True})
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Snapshots
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@app.get("/api/projects/<int:pid>/snapshots")
|
|
def snapshots_index(pid: int):
|
|
return jsonify(storage.list_snapshots(pid))
|
|
|
|
|
|
@app.get("/api/snapshots/<int:sid>")
|
|
def snapshot_show(sid: int):
|
|
snap = storage.get_snapshot(sid)
|
|
if snap is None:
|
|
return jsonify({"error": "not found"}), 404
|
|
return jsonify(snap)
|
|
|
|
|
|
@app.post("/api/snapshots/<int:sid>/restore")
|
|
def snapshot_restore(sid: int):
|
|
if not storage.restore_snapshot(sid):
|
|
return jsonify({"error": "not found"}), 404
|
|
return jsonify({"ok": True})
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Presets
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@app.get("/api/presets")
|
|
def presets_index():
|
|
return jsonify(storage.list_presets())
|
|
|
|
|
|
@app.post("/api/presets")
|
|
def presets_create():
|
|
body = request.get_json(silent=True) or {}
|
|
name = (body.get("name") or "").strip()
|
|
if not name:
|
|
return jsonify({"error": "name required"}), 400
|
|
pid = storage.create_preset(name, body.get("params") or {})
|
|
if pid is None:
|
|
return jsonify({"error": "name already in use"}), 409
|
|
return jsonify({"id": pid, "name": name})
|
|
|
|
|
|
@app.put("/api/presets/<int:pid>")
|
|
def presets_update(pid: int):
|
|
body = request.get_json(silent=True) or {}
|
|
ok = storage.update_preset(pid, name=body.get("name"), params=body.get("params"))
|
|
if not ok:
|
|
return jsonify({"error": "not found or name conflict"}), 404
|
|
return jsonify({"ok": True})
|
|
|
|
|
|
@app.delete("/api/presets/<int:pid>")
|
|
def presets_delete(pid: int):
|
|
storage.delete_preset(pid)
|
|
return jsonify({"ok": True})
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Boot
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
if __name__ == "__main__":
|
|
port = int(os.environ.get("PORT", 5000))
|
|
host = os.environ.get("HOST", "127.0.0.1")
|
|
debug = os.environ.get("FLASK_DEBUG", "1") == "1"
|
|
print(f" * Busbar Designer running on http://{host}:{port}", file=sys.stderr)
|
|
app.run(host=host, port=port, debug=debug)
|