Add macros, declarative handlers (defhandler), and convert all fragment routes to sx
Some checks failed
Build and Deploy / build-and-deploy (push) Has been cancelled
Some checks failed
Build and Deploy / build-and-deploy (push) Has been cancelled
Phase 1 — Macros: defmacro + quasiquote syntax (`, ,, ,@) in parser,
evaluator, HTML renderer, and JS mirror. Macro type, expansion, and
round-trip serialization.
Phase 2 — Expanded primitives: app-url, url-for, asset-url, config,
format-date, parse-int (pure); service, request-arg, request-path,
nav-tree, get-children (I/O); jinja-global, relations-from (pure).
Updated _io_service to accept (service "registry-name" "method" :kwargs)
with auto kebab→snake conversion. DTO-to-dict now expands datetime fields
into year/month/day convenience keys. Tuple returns converted to lists.
Phase 3 — Declarative handlers: HandlerDef type, defhandler special form,
handler registry (service → name → HandlerDef), async evaluator+renderer
(async_eval.py) that awaits I/O primitives inline within control flow.
Handler loading from .sx files, execute_handler, blueprint factory.
Phase 4 — Convert all fragment routes: 13 Python fragment handlers across
8 services replaced with declarative .sx handler files. All routes.py
simplified to uniform sx dispatch pattern. Two Jinja HTML handlers
(events/container-cards, events/account-page) kept as Python.
New files: shared/sx/async_eval.py, shared/sx/handlers.py,
shared/sx/tests/test_handlers.py, plus 13 handler .sx files under
{service}/sx/handlers/. MarketService.product_by_slug() added.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2,21 +2,22 @@
|
||||
|
||||
Exposes sx fragments at ``/internal/fragments/<type>`` for consumption
|
||||
by other coop apps via the fragment client.
|
||||
|
||||
All handlers are defined declaratively in .sx files under
|
||||
``market/sx/handlers/`` and dispatched via the sx handler registry.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from quart import Blueprint, Response, g, request
|
||||
from quart import Blueprint, Response, request
|
||||
|
||||
from shared.infrastructure.fragments import FRAGMENT_HEADER
|
||||
from shared.services.registry import services
|
||||
from shared.sx.handlers import get_handler, execute_handler
|
||||
|
||||
|
||||
def register():
|
||||
bp = Blueprint("fragments", __name__, url_prefix="/internal/fragments")
|
||||
|
||||
_handlers: dict[str, object] = {}
|
||||
|
||||
@bp.before_request
|
||||
async def _require_fragment_header():
|
||||
if not request.headers.get(FRAGMENT_HEADER):
|
||||
@@ -24,90 +25,12 @@ def register():
|
||||
|
||||
@bp.get("/<fragment_type>")
|
||||
async def get_fragment(fragment_type: str):
|
||||
handler = _handlers.get(fragment_type)
|
||||
if handler is None:
|
||||
return Response("", status=200, content_type="text/sx")
|
||||
src = await handler()
|
||||
return Response(src, status=200, content_type="text/sx")
|
||||
|
||||
# --- container-nav fragment: market links --------------------------------
|
||||
|
||||
async def _container_nav_handler():
|
||||
from quart import current_app
|
||||
from shared.infrastructure.urls import market_url
|
||||
from shared.sx.helpers import sx_call
|
||||
|
||||
container_type = request.args.get("container_type", "page")
|
||||
container_id = int(request.args.get("container_id", 0))
|
||||
post_slug = request.args.get("post_slug", "")
|
||||
|
||||
markets = await services.market.marketplaces_for_container(
|
||||
g.s, container_type, container_id,
|
||||
)
|
||||
if not markets:
|
||||
return ""
|
||||
styles = current_app.jinja_env.globals.get("styles", {})
|
||||
nav_class = styles.get("nav_button", "")
|
||||
select_colours = current_app.jinja_env.globals.get("select_colours", "")
|
||||
parts = []
|
||||
for m in markets:
|
||||
href = market_url(f"/{post_slug}/{m.slug}/")
|
||||
parts.append(sx_call("market-link-nav",
|
||||
href=href, name=m.name, nav_class=nav_class,
|
||||
select_colours=select_colours))
|
||||
return "(<> " + " ".join(parts) + ")"
|
||||
|
||||
_handlers["container-nav"] = _container_nav_handler
|
||||
|
||||
# --- link-card fragment: product preview card --------------------------------
|
||||
|
||||
def _product_link_card_sx(product, link: str) -> str:
|
||||
from shared.sx.helpers import sx_call
|
||||
subtitle = product.brand or ""
|
||||
detail = ""
|
||||
if product.special_price:
|
||||
detail = f"{product.regular_price} → {product.special_price}"
|
||||
elif product.regular_price:
|
||||
detail = str(product.regular_price)
|
||||
return sx_call("link-card",
|
||||
title=product.title, image=product.image,
|
||||
subtitle=subtitle, detail=detail,
|
||||
link=link)
|
||||
|
||||
async def _link_card_handler():
|
||||
from sqlalchemy import select
|
||||
from shared.models.market import Product
|
||||
from shared.infrastructure.urls import market_url
|
||||
|
||||
slug = request.args.get("slug", "")
|
||||
keys_raw = request.args.get("keys", "")
|
||||
|
||||
# Batch mode
|
||||
if keys_raw:
|
||||
slugs = [k.strip() for k in keys_raw.split(",") if k.strip()]
|
||||
parts = []
|
||||
for s in slugs:
|
||||
parts.append(f"<!-- fragment:{s} -->")
|
||||
product = (
|
||||
await g.s.execute(select(Product).where(Product.slug == s))
|
||||
).scalar_one_or_none()
|
||||
if product:
|
||||
parts.append(_product_link_card_sx(
|
||||
product, market_url(f"/product/{product.slug}/")))
|
||||
return "\n".join(parts)
|
||||
|
||||
# Single mode
|
||||
if not slug:
|
||||
return ""
|
||||
product = (
|
||||
await g.s.execute(select(Product).where(Product.slug == slug))
|
||||
).scalar_one_or_none()
|
||||
if not product:
|
||||
return ""
|
||||
return _product_link_card_sx(product, market_url(f"/product/{product.slug}/"))
|
||||
|
||||
_handlers["link-card"] = _link_card_handler
|
||||
|
||||
bp._fragment_handlers = _handlers
|
||||
handler_def = get_handler("market", fragment_type)
|
||||
if handler_def is not None:
|
||||
result = await execute_handler(
|
||||
handler_def, "market", args=dict(request.args),
|
||||
)
|
||||
return Response(result, status=200, content_type="text/sx")
|
||||
return Response("", status=200, content_type="text/sx")
|
||||
|
||||
return bp
|
||||
|
||||
21
market/sx/handlers/container-nav.sx
Normal file
21
market/sx/handlers/container-nav.sx
Normal file
@@ -0,0 +1,21 @@
|
||||
;; Market container-nav fragment handler
|
||||
;;
|
||||
;; Renders marketplace link nav items for blog post pages.
|
||||
|
||||
(defhandler container-nav (&key container_type container_id post_slug)
|
||||
(let ((ct (or container_type "page"))
|
||||
(cid (parse-int (or container_id "0")))
|
||||
(slug (or post_slug ""))
|
||||
(markets (service "market" "marketplaces-for-container"
|
||||
:container-type ct :container-id cid)))
|
||||
(when (not (empty? markets))
|
||||
(let ((styles (or (jinja-global "styles") (dict)))
|
||||
(nav-class (or (get styles "nav_button") ""))
|
||||
(sel-colours (or (jinja-global "select_colours") "")))
|
||||
(<> (map (fn (m)
|
||||
(let ((href (app-url "market" (str "/" slug "/" (get m "slug") "/"))))
|
||||
(~market-link-nav
|
||||
:href href
|
||||
:name (get m "name")
|
||||
:nav-class nav-class
|
||||
:select-colours sel-colours))) markets))))))
|
||||
42
market/sx/handlers/link-card.sx
Normal file
42
market/sx/handlers/link-card.sx
Normal file
@@ -0,0 +1,42 @@
|
||||
;; Market link-card fragment handler
|
||||
;;
|
||||
;; Renders product preview card(s) by slug.
|
||||
;; Supports single mode (?slug=x) and batch mode (?keys=x,y,z).
|
||||
|
||||
(defhandler link-card (&key slug keys)
|
||||
(if keys
|
||||
(let ((slugs (filter (fn (s) (not (empty? s)))
|
||||
(map trim (split keys ",")))))
|
||||
(<> (map (fn (s)
|
||||
(let ((product (service "market" "product-by-slug" :slug s)))
|
||||
(<> (str "<!-- fragment:" s " -->")
|
||||
(when (not (nil? product))
|
||||
(let ((link (app-url "market" (str "/product/" (get product "slug") "/")))
|
||||
(subtitle (or (get product "brand") ""))
|
||||
(detail (if (get product "special_price")
|
||||
(str (get product "regular_price") " → " (get product "special_price"))
|
||||
(if (get product "regular_price")
|
||||
(str (get product "regular_price"))
|
||||
""))))
|
||||
(~link-card
|
||||
:title (get product "title")
|
||||
:image (get product "image")
|
||||
:subtitle subtitle
|
||||
:detail detail
|
||||
:link link)))))) slugs)))
|
||||
(when slug
|
||||
(let ((product (service "market" "product-by-slug" :slug slug)))
|
||||
(when (not (nil? product))
|
||||
(let ((link (app-url "market" (str "/product/" (get product "slug") "/")))
|
||||
(subtitle (or (get product "brand") ""))
|
||||
(detail (if (get product "special_price")
|
||||
(str (get product "regular_price") " → " (get product "special_price"))
|
||||
(if (get product "regular_price")
|
||||
(str (get product "regular_price"))
|
||||
""))))
|
||||
(~link-card
|
||||
:title (get product "title")
|
||||
:image (get product "image")
|
||||
:subtitle subtitle
|
||||
:detail detail
|
||||
:link link)))))))
|
||||
@@ -22,8 +22,9 @@ from shared.sx.helpers import (
|
||||
full_page_sx, oob_page_sx,
|
||||
)
|
||||
|
||||
# Load market-specific .sx components at import time
|
||||
load_service_components(os.path.dirname(os.path.dirname(__file__)))
|
||||
# Load market-specific .sx components + handlers at import time
|
||||
load_service_components(os.path.dirname(os.path.dirname(__file__)),
|
||||
service_name="market")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user