giles
1f36987f77
The inter-service data layer (fetch_data/call_action) was the least structured part of the codebase — Python _handlers dicts with ad-hoc param extraction scattered across 16 route files. This replaces them with declarative .sx query/action definitions that make the entire inter-service protocol self-describing and greppable. Infrastructure: - defquery/defaction special forms in the sx evaluator - Query/action registry with load, lookup, and schema introspection - Query executor using async_eval with I/O primitives - Blueprint factories (create_data_blueprint/create_action_blueprint) with sx-first dispatch and Python fallback - /internal/schema endpoint on every service - parse-datetime and split-ids primitives for type coercion Service extractions: - LikesService (toggle, is_liked, liked_slugs, liked_ids) - PageConfigService (ensure, get_by_container, get_by_id, get_batch, update) - RelationsService (wraps module-level functions) - AccountDataService (user_by_email, newsletters) - CartItemsService, MarketDataService (raw SQLAlchemy lookups) 50 of 54 handlers converted to sx, 4 Python fallbacks remain (ghost-sync/push-member, clear-cart-for-order, create-order). Net: -1,383 lines Python, +251 lines modified. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
56 lines
1.7 KiB
Python
56 lines
1.7 KiB
Python
"""Extra market query methods for raw-SQLAlchemy data lookups.
|
|
|
|
products-by-ids and marketplaces-by-ids use direct selects rather
|
|
than the MarketService protocol methods.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
|
|
class SqlMarketDataService:
|
|
|
|
async def products_by_ids(
|
|
self, session: AsyncSession, *, ids: list[int],
|
|
) -> list[dict[str, Any]]:
|
|
if not ids:
|
|
return []
|
|
from shared.models.market import Product
|
|
rows = (await session.execute(
|
|
select(Product).where(Product.id.in_(ids))
|
|
)).scalars().all()
|
|
return [
|
|
{
|
|
"id": p.id,
|
|
"title": p.title,
|
|
"slug": p.slug,
|
|
"image": p.image,
|
|
"regular_price": str(p.regular_price) if p.regular_price is not None else None,
|
|
"special_price": str(p.special_price) if p.special_price is not None else None,
|
|
}
|
|
for p in rows
|
|
]
|
|
|
|
async def marketplaces_by_ids(
|
|
self, session: AsyncSession, *, ids: list[int],
|
|
) -> list[dict[str, Any]]:
|
|
if not ids:
|
|
return []
|
|
from shared.models.market_place import MarketPlace
|
|
rows = (await session.execute(
|
|
select(MarketPlace).where(MarketPlace.id.in_(ids))
|
|
)).scalars().all()
|
|
return [
|
|
{
|
|
"id": m.id,
|
|
"name": m.name,
|
|
"slug": m.slug,
|
|
"container_type": m.container_type,
|
|
"container_id": m.container_id,
|
|
}
|
|
for m in rows
|
|
]
|