feat: decouple events from shared_lib, add app-owned models

Phase 1-3 of decoupling:
- path_setup.py adds project root to sys.path
- Events-owned models in events/models/ (calendars with all related models)
- All imports updated: shared.infrastructure, shared.db, shared.browser, etc.
- Calendar uses container_type/container_id instead of post_id FK
- CalendarEntryPost uses content_type/content_id (generic content refs)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-02-11 12:46:36 +00:00
parent 95d954fdb6
commit 154f968296
37 changed files with 506 additions and 93 deletions

View File

@@ -5,8 +5,8 @@ from quart import (
)
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
@@ -17,7 +17,7 @@ def register():
@bp.get("/")
@require_admin
async def admin(calendar_slug: str, **kwargs):
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
# Determine which template to use based on request type
if not is_htmx_request():

View File

@@ -11,7 +11,7 @@ from sqlalchemy import select
from models.calendars import Calendar
from sqlalchemy.orm import selectinload, with_loader_criteria
from suma_browser.app.authz import require_admin
from shared.browser.app.authz import require_admin
from .admin.routes import register as register_admin
from .services import get_visible_entries_for_period
@@ -23,17 +23,17 @@ from .services.calendar_view import (
get_calendar_by_slug,
update_calendar_description,
)
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
from ..slots.routes import register as register_slots
from models.calendars import CalendarSlot
from suma_browser.app.bp.calendars.services.calendars import soft_delete
from bp.calendars.services.calendars import soft_delete
from suma_browser.app.bp.day.routes import register as register_day
from bp.day.routes import register as register_day
from suma_browser.app.redis_cacher import cache_page, clear_cache
from shared.browser.app.redis_cacher import cache_page, clear_cache
from sqlalchemy import select
@@ -213,7 +213,7 @@ def register():
@require_admin
@clear_cache(tag="calendars", tag_scope="all")
async def delete(calendar_slug: str, **kwargs):
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
cal = g.calendar
cal.deleted_at = datetime.now(timezone.utc)
@@ -230,7 +230,7 @@ def register():
cals = (
await g.s.execute(
select(Calendar)
.where(Calendar.post_id == post_id, Calendar.deleted_at.is_(None))
.where(Calendar.container_type == "page", Calendar.container_id == post_id, Calendar.deleted_at.is_(None))
.order_by(Calendar.name.asc())
)
).scalars().all()

View File

@@ -1,5 +1,6 @@
from sqlalchemy import select, update
from models.calendars import CalendarEntry
from sqlalchemy import func
async def adopt_session_entries_for_user(session, user_id: int, session_id: str | None) -> None:

View File

@@ -11,7 +11,6 @@ from sqlalchemy.orm import selectinload, with_loader_criteria
from models.calendars import Calendar, CalendarSlot
def parse_int_arg(name: str, default: Optional[int] = None) -> Optional[int]:
"""Parse an integer query parameter from the request."""
val = request.args.get(name, "").strip()
@@ -71,7 +70,8 @@ async def get_calendar_by_post_and_slug(
with_loader_criteria(CalendarSlot, CalendarSlot.deleted_at.is_(None)),
)
.where(
Calendar.post_id == post_id,
Calendar.container_type == "page",
Calendar.container_id == post_id,
Calendar.slug == calendar_slug,
Calendar.deleted_at.is_(None),
)

View File

@@ -8,6 +8,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import CalendarSlot
class SlotError(ValueError):
pass

View File

@@ -10,6 +10,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import CalendarEntry
@dataclass
class VisibleEntries:
"""

View File

@@ -11,18 +11,20 @@ from sqlalchemy import update
from models.calendars import CalendarEntry
from .services.entries import (
add_entry as svc_add_entry,
)
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from suma_browser.app.bp.calendar_entry.routes import register as register_calendar_entry
from bp.calendar_entry.routes import register as register_calendar_entry
from models.calendars import CalendarSlot
from sqlalchemy import select

View File

@@ -7,9 +7,10 @@ from sqlalchemy import select, and_, or_
from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import Calendar, CalendarEntry
from datetime import datetime
from suma_browser.app.errors import AppError
from shared.browser.app.errors import AppError
class CalendarError(AppError):
"""Base error for calendar service operations."""
@@ -120,7 +121,8 @@ async def list_entries(
await sess.execute(
select(Calendar.id)
.where(
Calendar.post_id == post_id,
Calendar.container_type == "page",
Calendar.container_id == post_id,
Calendar.slug == calendar_slug,
Calendar.deleted_at.is_(None),
)

View File

@@ -5,7 +5,7 @@ from quart import (
)
from suma_browser.app.authz import require_admin
from shared.browser.app.authz import require_admin
def register():
@@ -15,7 +15,7 @@ def register():
@bp.get("/")
@require_admin
async def admin(entry_id: int, **kwargs):
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
# Determine which template to use based on request type
if not is_htmx_request():

View File

@@ -5,8 +5,8 @@ from sqlalchemy import select, update
from models.calendars import CalendarEntry, CalendarSlot
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from sqlalchemy import select
@@ -142,7 +142,7 @@ def register():
calendars = (
await g.s.execute(
select(Calendar)
.where(Calendar.post_id == post.id, Calendar.deleted_at.is_(None))
.where(Calendar.container_type == "page", Calendar.container_id == post.id, Calendar.deleted_at.is_(None))
.order_by(Calendar.name.asc())
)
).scalars().all()
@@ -199,7 +199,7 @@ def register():
@bp.get("/")
@require_admin
async def get(entry_id: int, **rest):
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
# TODO: Create _main_panel.html and _oob_elements.html for optimized HTMX
# For now, render full template for both HTMX and normal requests

View File

@@ -5,7 +5,7 @@ from sqlalchemy import select
from sqlalchemy.sql import func
from models.calendars import CalendarEntry, CalendarEntryPost
from models.ghost_content import Post
from blog.models.ghost_content import Post
async def add_post_to_entry(
@@ -38,7 +38,8 @@ async def add_post_to_entry(
existing = await session.scalar(
select(CalendarEntryPost).where(
CalendarEntryPost.entry_id == entry_id,
CalendarEntryPost.post_id == post_id,
CalendarEntryPost.content_type == "post",
CalendarEntryPost.content_id == post_id,
CalendarEntryPost.deleted_at.is_(None)
)
)
@@ -49,7 +50,8 @@ async def add_post_to_entry(
# Create association
association = CalendarEntryPost(
entry_id=entry_id,
post_id=post_id
content_type="post",
content_id=post_id
)
session.add(association)
await session.flush()
@@ -70,7 +72,8 @@ async def remove_post_from_entry(
association = await session.scalar(
select(CalendarEntryPost).where(
CalendarEntryPost.entry_id == entry_id,
CalendarEntryPost.post_id == post_id,
CalendarEntryPost.content_type == "post",
CalendarEntryPost.content_id == post_id,
CalendarEntryPost.deleted_at.is_(None)
)
)

View File

@@ -9,6 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import CalendarEntry
async def update_ticket_config(
session: AsyncSession,
entry_id: int,

View File

@@ -7,16 +7,17 @@ from sqlalchemy import select
from models.calendars import Calendar
from .services.calendars import (
create_calendar as svc_create_calendar,
)
from ..calendar.routes import register as register_calendar
from suma_browser.app.redis_cacher import cache_page, clear_cache
from shared.browser.app.redis_cacher import cache_page, clear_cache
from suma_browser.app.authz import require_admin
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.authz import require_admin
from shared.browser.app.utils.htmx import is_htmx_request
def register():
@@ -78,7 +79,7 @@ def register():
cals = (
await g.s.execute(
select(Calendar)
.where(Calendar.post_id == post_id, Calendar.deleted_at.is_(None))
.where(Calendar.container_type == "page", Calendar.container_id == post_id, Calendar.deleted_at.is_(None))
.order_by(Calendar.name.asc())
)
).scalars().all()

View File

@@ -4,7 +4,7 @@ from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import Calendar
from models.ghost_content import Post # for FK existence checks
from blog.models.ghost_content import Post # for FK existence checks
import unicodedata
import re
@@ -12,7 +12,7 @@ import re
class CalendarError(ValueError):
"""Base error for calendar service operations."""
from suma_browser.app.utils import (
from shared.browser.app.utils import (
utcnow
)
@@ -51,7 +51,8 @@ async def soft_delete(sess: AsyncSession, post_slug: str, calendar_slug: str) ->
cal = (
await sess.execute(
select(Calendar)
.join(Post, Calendar.post_id == Post.id)
.join(Post, Calendar.container_id == Post.id)
.where(Calendar.container_type == "page")
.where(
Post.slug == post_slug,
Calendar.slug == calendar_slug,
@@ -89,7 +90,7 @@ async def create_calendar(sess: AsyncSession, post_id: int, name: str) -> Calend
# Look for existing (including soft-deleted)
q = await sess.execute(
select(Calendar).where(Calendar.post_id == post_id, Calendar.name == name)
select(Calendar).where(Calendar.container_type == "page", Calendar.container_id == post_id, Calendar.name == name)
)
existing = q.scalar_one_or_none()
@@ -100,7 +101,7 @@ async def create_calendar(sess: AsyncSession, post_id: int, name: str) -> Calend
return existing
raise CalendarError(f'Calendar with slug "{slug}" already exists for post {post_id}.')
cal = Calendar(post_id=post_id, name=name, slug=slug)
cal = Calendar(container_type="page", container_id=post_id, name=name, slug=slug)
sess.add(cal)
await sess.flush()
return cal

View File

@@ -5,7 +5,7 @@ from quart import (
)
from suma_browser.app.authz import require_admin
from shared.browser.app.authz import require_admin
def register():
@@ -15,7 +15,7 @@ def register():
@bp.get("/")
@require_admin
async def admin(year: int, month: int, day: int, **kwargs):
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
# Determine which template to use based on request type
if not is_htmx_request():

View File

@@ -5,17 +5,18 @@ from quart import (
request, render_template, make_response, Blueprint, g, abort, session as qsession
)
from suma_browser.app.bp.calendar.services import get_visible_entries_for_period
from bp.calendar.services import get_visible_entries_for_period
from suma_browser.app.bp.calendar_entries.routes import register as register_calendar_entries
from bp.calendar_entries.routes import register as register_calendar_entries
from .admin.routes import register as register_admin
from suma_browser.app.redis_cacher import cache_page
from shared.browser.app.redis_cacher import cache_page
from models.calendars import CalendarSlot # add this import
from sqlalchemy import select
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
def register():

View File

@@ -5,16 +5,16 @@ from quart import (
)
from sqlalchemy import select
from models.market_place import MarketPlace
from market.models.market_place import MarketPlace
from .services.markets import (
create_market as svc_create_market,
soft_delete as svc_soft_delete,
)
from suma_browser.app.redis_cacher import cache_page, clear_cache
from suma_browser.app.authz import require_admin
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.redis_cacher import cache_page, clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.utils.htmx import is_htmx_request
def register():

View File

@@ -6,9 +6,9 @@ import unicodedata
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from models.market_place import MarketPlace
from models.ghost_content import Post
from suma_browser.app.utils import utcnow
from market.models.market_place import MarketPlace
from blog.models.ghost_content import Post
from shared.browser.app.utils import utcnow
class MarketError(ValueError):
@@ -47,7 +47,7 @@ async def create_market(sess: AsyncSession, post_id: int, name: str) -> MarketPl
# Look for existing (including soft-deleted)
existing = (await sess.execute(
select(MarketPlace).where(MarketPlace.post_id == post_id, MarketPlace.slug == slug)
select(MarketPlace).where(MarketPlace.container_type == "page", MarketPlace.container_id == post_id, MarketPlace.slug == slug)
)).scalar_one_or_none()
if existing:
@@ -58,7 +58,7 @@ async def create_market(sess: AsyncSession, post_id: int, name: str) -> MarketPl
return existing
raise MarketError(f'Market with slug "{slug}" already exists for this page.')
market = MarketPlace(post_id=post_id, name=name, slug=slug)
market = MarketPlace(container_type="page", container_id=post_id, name=name, slug=slug)
sess.add(market)
await sess.flush()
return market
@@ -68,7 +68,8 @@ async def soft_delete(sess: AsyncSession, post_slug: str, market_slug: str) -> b
market = (
await sess.execute(
select(MarketPlace)
.join(Post, MarketPlace.post_id == Post.id)
.join(Post, MarketPlace.container_id == Post.id)
.where(MarketPlace.container_type == "page")
.where(
Post.slug == post_slug,
MarketPlace.slug == market_slug,

View File

@@ -5,10 +5,10 @@ from quart import (
)
from sqlalchemy import select
from models.page_config import PageConfig
from cart.models.page_config import PageConfig
from suma_browser.app.authz import require_admin
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.authz import require_admin
from shared.browser.app.utils.htmx import is_htmx_request
def register():
@@ -26,7 +26,7 @@ def register():
return {}
pc = (await g.s.execute(
select(PageConfig).where(PageConfig.post_id == post_id)
select(PageConfig).where(PageConfig.container_type == "page", PageConfig.container_id == post_id)
)).scalar_one_or_none()
return {
@@ -55,10 +55,10 @@ def register():
return await make_response("Post not found", 404)
pc = (await g.s.execute(
select(PageConfig).where(PageConfig.post_id == post_id)
select(PageConfig).where(PageConfig.container_type == "page", PageConfig.container_id == post_id)
)).scalar_one_or_none()
if pc is None:
pc = PageConfig(post_id=post_id, features={})
pc = PageConfig(container_type="page", container_id=post_id, features={})
g.s.add(pc)
await g.s.flush()

View File

@@ -6,8 +6,8 @@ from quart import (
from sqlalchemy.exc import IntegrityError
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from .services.slot import (
update_slot as svc_update_slot,
@@ -19,11 +19,11 @@ from ..slots.services.slots import (
list_slots as svc_list_slots,
)
from suma_browser.app.utils import (
from shared.browser.app.utils import (
parse_time,
parse_cost
)
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
def register():

View File

@@ -6,6 +6,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import CalendarSlot
class SlotError(ValueError):
pass

View File

@@ -5,8 +5,8 @@ from quart import (
)
from sqlalchemy.exc import IntegrityError
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from .services.slots import (
list_slots as svc_list_slots,
@@ -15,11 +15,11 @@ from .services.slots import (
from ..slot.routes import register as register_slot
from suma_browser.app.utils import (
from shared.browser.app.utils import (
parse_time,
parse_cost
)
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
def register():

View File

@@ -8,6 +8,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import CalendarSlot
class SlotError(ValueError):
pass

View File

@@ -18,8 +18,8 @@ from sqlalchemy import select, func
from sqlalchemy.orm import selectinload
from models.calendars import CalendarEntry, Ticket, TicketType
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from ..tickets.services.tickets import (
get_ticket_by_code,
@@ -37,7 +37,7 @@ def register() -> Blueprint:
@require_admin
async def dashboard():
"""Ticket admin dashboard with QR scanner and recent tickets."""
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
# Get recent tickets
result = await g.s.execute(
@@ -89,7 +89,7 @@ def register() -> Blueprint:
@require_admin
async def entry_tickets(entry_id: int):
"""List all tickets for a specific calendar entry."""
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
entry = await g.s.scalar(
select(CalendarEntry)

View File

@@ -4,8 +4,8 @@ from quart import (
request, render_template, make_response, Blueprint, g, jsonify
)
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from .services.ticket import (
get_ticket_type as svc_get_ticket_type,
@@ -16,7 +16,7 @@ from .services.ticket import (
from ..ticket_types.services.tickets import (
list_ticket_types as svc_list_ticket_types,
)
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
def register():

View File

@@ -4,6 +4,7 @@ from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from models.calendars import TicketType
from datetime import datetime, timezone

View File

@@ -4,8 +4,8 @@ from quart import (
request, render_template, make_response, Blueprint, g, jsonify
)
from suma_browser.app.authz import require_admin
from suma_browser.app.redis_cacher import clear_cache
from shared.browser.app.authz import require_admin
from shared.browser.app.redis_cacher import clear_cache
from .services.tickets import (
list_ticket_types as svc_list_ticket_types,
@@ -14,7 +14,7 @@ from .services.tickets import (
from ..ticket_type.routes import register as register_ticket_type
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
def register():

View File

@@ -5,6 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import selectinload
from models.calendars import TicketType
from datetime import datetime, timezone

View File

@@ -17,8 +17,8 @@ from sqlalchemy import select
from sqlalchemy.orm import selectinload
from models.calendars import CalendarEntry
from shared.cart_identity import current_cart_identity
from suma_browser.app.redis_cacher import clear_cache
from shared.infrastructure.cart_identity import current_cart_identity
from shared.browser.app.redis_cacher import clear_cache
from .services.tickets import (
create_ticket,
@@ -37,7 +37,7 @@ def register() -> Blueprint:
@bp.get("/")
async def my_tickets():
"""List all tickets for the current user/session."""
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
ident = current_cart_identity()
tickets = await get_user_tickets(
@@ -62,7 +62,7 @@ def register() -> Blueprint:
@bp.get("/<code>/")
async def ticket_detail(code: str):
"""View a single ticket with QR code."""
from suma_browser.app.utils.htmx import is_htmx_request
from shared.browser.app.utils.htmx import is_htmx_request
ticket = await get_ticket_by_code(g.s, code)
if not ticket:

View File

@@ -14,6 +14,7 @@ from sqlalchemy.orm import selectinload
from models.calendars import Ticket, TicketType, CalendarEntry
async def create_ticket(
session: AsyncSession,
*,