Complete and total rework ahead.

crudkit/__init__.py

@@ -1,8 +0,0 @@
-from .mixins import CrudMixin
-from .dsl import QuerySpec
-from .eager import default_eager_policy
-from .service import CrudService
-from .serialize import serialize
-from .blueprint import make_blueprint
-
-__all__ = ["CrudMixin", "QuerySpec", "default_eager_policy", "CrudService", "serialize", "make_blueprint"]

crudkit/api/flask_api.py

@@ -0,0 +1,31 @@
+from flask import Blueprint, jsonify, request
+
+def generate_crud_blueprint(model, service):
+    bp = Blueprint(model.__name__.lower(), __name__)
+
+    @bp.get('/')
+    def list_items():
+        items = service.list(request.args)
+        return jsonify([item.as_dict() for item in items])
+
+    @bp.get('/<int:id>')
+    def get_item(id):
+        item = service.get(id)
+        return jsonify(item.as_dict())
+
+    @bp.post('/')
+    def create_item():
+        obj = service.create(request.json)
+        return jsonify(obj.as_dict())
+
+    @bp.patch('/<int:id>')
+    def update_item(id):
+        obj = service.update(id, request.json)
+        return jsonify(obj.as_dict())
+
+    @bp.delete('/<int:id>')
+    def delete_item(id):
+        service.delete(id)
+        return '', 204
+
+    return bp

crudkit/blueprint.py

@@ -1,81 +0,0 @@
-from flask import Blueprint, request, jsonify, abort
-from sqlalchemy.orm import scoped_session
-from .dsl import QuerySpec
-from .service import CrudService
-from .eager import default_eager_policy
-from .serialize import serialize
-
-def make_blueprint(db_session_factory, registry):
-    bp = Blueprint("crud", __name__)
-    def session(): return scoped_session(db_session_factory)()
-
-    @bp.get("/<model>/list")
-    def list_items(model):
-        Model = registry.get(model) or abort(404)
-        spec = QuerySpec(
-            filters=_parse_filters(request.args),
-            order_by=request.args.getlist("sort"),
-            page=request.args.get("page", type=int),
-            per_page=request.args.get("per_page", type=int),
-            expand=request.args.getlist("expand"),
-            fields=request.args.get("fields", type=lambda s: [x.strip() for x in s.split(",")] if s else None),
-        )
-        s = session(); svc = CrudService(s, default_eager_policy)
-        rows, total = svc.list(Model, spec)
-        data = [serialize(r, fields=spec.fields, expand=spec.expand) for r in rows]
-        return jsonify({"data": data, "total": total})
-
-    @bp.post("/<model>")
-    def create_item(model):
-        Model = registry.get(model) or abort(404)
-        payload = request.get_json() or {}
-        s = session(); svc = CrudService(s, default_eager_policy)
-        obj = svc.create(Model, payload)
-        s.commit()
-        return jsonify(serialize(obj)), 201
-
-    @bp.get("/<model>/<int:id>")
-    def read_item(model, id):
-        Model = registry.get(model) or abort(404)
-        spec = QuerySpec(expand=request.args.getlist("expand"),
-                         fields=request.args.get("fields", type=lambda s: s.split(",")))
-        s = session(); svc = CrudService(s, default_eager_policy)
-        obj = svc.get(Model, id, spec) or abort(404)
-        return jsonify(serialize(obj, fields=spec.fields, expand=spec.expand))
-
-    @bp.patch("/<model>/<int:id>")
-    def update_item(model, id):
-        Model = registry.get(model) or abort(404)
-        s = session(); svc = CrudService(s, default_eager_policy)
-        obj = svc.get(Model, id, QuerySpec()) or abort(404)
-        payload = request.get_json() or {}
-        svc.update(obj, payload)
-        s.commit()
-        return jsonify(serialize(obj))
-
-    @bp.delete("/<model>/<int:id>")
-    def delete_item(model, id):
-        Model = registry.get(model) or abort(404)
-        s = session(); svc = CrudService(s, default_eager_policy)
-        obj = svc.get(Model, id, QuerySpec()) or abort(404)
-        svc.soft_delete(obj)
-        s.commit()
-        return jsonify({"status": "deleted"})
-
-    @bp.post("/<model>/<int:id>/undelete")
-    def undelete_item(model, id):
-        Model = registry.get(model) or abort(404)
-        s = session(); svc = CrudService(s, default_eager_policy)
-        obj = svc.get(Model, id, QuerySpec()) or abort(404)
-        svc.undelete(obj)
-        s.commit()
-        return jsonify({"status": "restored"})
-    return bp
-
-def _parse_filters(args):
-    out = {}
-    for k, v in args.items():
-        if k in {"page", "per_page", "sort", "expand", "fields"}:
-            continue
-        out[k] = v
-    return out

crudkit/core/base.py

@@ -0,0 +1,26 @@
+from sqlalchemy import Column, Integer, DateTime, Boolean, String, JSON, func
+from sqlalchemy.orm import declarative_mixin, declarative_base
+
+Base = declarative_base()
+
+@declarative_mixin
+class CRUDMixin:
+    id = Column(Integer, primary_key=True)
+    created_at = Column(DateTime, default=func.now())
+    updated_at = Column(DateTime, default=func.now(), onupdate=func.now())
+
+    def as_dict(self):
+        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+class Version(Base):
+    __tablename__ = "versions"
+
+    id = Column(Integer, primary_key=True)
+    model_name = Column(String, nullable=False)
+    object_id = Column(Integer, nullable=False)
+    change_type = Column(String, nullable=False)
+    data = Column(JSON, nullable=True)
+    timestamp = Column(DateTime, default=func.now())
+
+    actor = Column(String, nullable=True)
+    metadata = Column(JSON, nullable=True)

crudkit/core/service.py

@@ -0,0 +1,104 @@
+from typing import Type, TypeVar, Generic
+from sqlalchemy.orm import Session
+from crudkit.core.base import Version
+from crudkit.core.spec import CRUDSpec
+
+T = TypeVar("T")
+
+def _is_truthy(val):
+    return str(val).lower() in ('1', 'true', 'yes', 'on')
+
+class CRUDService(Generic[T]):
+    def __init__(self, model: Type[T], session: Session):
+        self.model = model
+        self.session = session
+        self.supports_soft_delete = hasattr(model, 'is_deleted')
+
+    def get(self, id: int, include_deleted: bool = False) -> T | None:
+        obj = self.session.get(self.model, id)
+        if obj is None:
+            return None
+        if self.supports_soft_delete and not include_deleted and obj.is_deleted:
+            return None
+        return obj
+
+    def list(self, params=None) -> list[T]:
+        query = self.session.query(self.model)
+
+        if params:
+            if self.supports_soft_delete:
+                include_deleted = False
+                include_deleted = _is_truthy(params.get('include_deleted'))
+                if not include_deleted:
+                    query = query.filter(self.model.is_deleted == False)
+            spec = CRUDSpec(self.model, params)
+            filters = spec.parse_filters()
+            order_by = spec.parse_sort()
+            limit, offset = spec.parse_pagination()
+
+            for parent, relationship_attr, alias in spec.get_join_paths():
+                query = query.join(alias, relationship_attr.of_type(alias), isouter=True)
+
+            for eager in spec.get_eager_loads():
+                query = query.options(eager)
+
+            if filters:
+                query = query.filter(*filters)
+            if order_by:
+                query = query.order_by(*order_by)
+            query = query.offset(offset).limit(limit)
+        return query.all()
+
+    def create(self, data: dict, actor=None) -> T:
+        obj = self.model(**data)
+        self.session.add(obj)
+        self.session.commit()
+
+        self._log_version("create", obj, actor)
+        return obj
+
+    def update(self, id: int, data: dict, actor=None) -> T:
+        obj = self.get(id)
+        if not obj:
+            raise ValueError(f"{self.model.__name__} with ID {id} not found.")
+
+        valid_fields = {c.name for c in self.model.__table__.columns}
+        for k, v in data.items():
+            if k in valid_fields:
+                setattr(obj, k, v)
+        self.session.commit()
+
+        self._log_version("update", obj, actor)
+        return obj
+
+    def delete(self, id: int, hard: bool = False, actor = False):
+        obj = self.session.get(self.model, id)
+        if not obj:
+            return None
+
+        if hard or not self.supports_soft_delete:
+            self.session.delete(obj)
+        else:
+            obj.is_deleted = True
+
+        self.session.commit()
+
+        self._log_version("delete", obj, actor)
+        return obj
+
+    def _log_version(self, change_type: str, obj: T, actor=None, metadata: dict = {}):
+        try:
+            data = obj.as_dict()
+        except Exception:
+            data = {"error": "Failed to serialize object."}
+
+        version = Version(
+            model_name=self.model.__name__,
+            object_id=obj.id,
+            change_type=change_type,
+            data=data,
+            actor=str(actor) if actor else None,
+            metadata=metadata
+        )
+        self.session.add(version)
+        self.session.commit()

crudkit/core/spec.py

@@ -0,0 +1,110 @@
+from typing import List, Tuple, Set, Dict
+from sqlalchemy import asc, desc
+from sqlalchemy.orm import joinedload, aliased
+from sqlalchemy.orm.attributes import InstrumentedAttribute
+
+OPERATORS = {
+    'eq': lambda col, val: col == val,
+    'lt': lambda col, val: col < val,
+    'lte': lambda col, val: col <= val,
+    'gt': lambda col, val: col > val,
+    'gte': lambda col, val: col >= val,
+    'ne': lambda col, val: col != val,
+    'icontains': lambda col, val: col.ilike(f"%{val}%"),
+}
+
+class CRUDSpec:
+    def __init__(self, model, params):
+        self.model = model
+        self.params = params
+        self.eager_paths: Set[Tuple[str, ...]] = set()
+        self.join_paths: List[Tuple[object, InstrumentedAttribute, object]] = []
+        self.alias_map: Dict[Tuple[str, ...], object] = {}
+
+    def _resolve_column(self, path: str):
+        current_model = self.model
+        current_alias = self.model
+        parts = path.split('.')
+        join_path = []
+
+        for i, attr in enumerate(parts):
+            if not hasattr(current_model, attr):
+                return None, None
+            attr_obj = getattr(current_model, attr)
+            if isinstance(attr_obj, InstrumentedAttribute):
+                if hasattr(attr_obj.property, 'direction'):
+                    join_path.append(attr)
+                    path_key = tuple(join_path)
+                    alias = self.alias_map.get(path_key)
+                    if not alias:
+                        alias = aliased(attr_obj.property.mapper.class_)
+                        self.alias_map[path_key] = alias
+                        self.join_paths.append((current_alias, attr_obj, alias))
+                    current_model = attr_obj.property.mapper.class_
+                    current_alias = alias
+                else:
+                    return getattr(current_alias, attr), tuple(join_path) if join_path else None
+        return None, None
+
+    def parse_filters(self):
+        filters = []
+        for key, value in self.params.items():
+            if key in ('sort', 'limit', 'offset'):
+                continue
+            if '__' in key:
+                path_op = key.rsplit('__', 1)
+                if len(path_op) != 2:
+                    continue
+                path, op = path_op
+            else:
+                path, op = key, 'eq'
+            col, join_path = self._resolve_column(path)
+            if col and op in OPERATORS:
+                filters.append(OPERATORS[op](col, value))
+                if join_path:
+                    self.eager_paths.add(join_path)
+        return filters
+
+    def parse_sort(self):
+        sort_args = self.params.get('sort', '')
+        result = []
+        for part in sort_args.split(','):
+            part = part.strip()
+            if not part:
+                continue
+            if part.startswith('-'):
+                field = part[1:]
+                order = desc
+            else:
+                field = part
+                order = asc
+            col, join_path = self._resolve_column(field)
+            if col:
+                result.append(order(col))
+                if join_path:
+                    self.eager_paths.add(join_path)
+        return result
+
+    def parse_pagination(self):
+        limit = int(self.params.get('limit', 100))
+        offset = int(self.params.get('offset', 0))
+        return limit, offset
+
+    def get_eager_loads(self):
+        loads = []
+        for path in self.eager_paths:
+            current = self.model
+            loader = None
+            for attr in path:
+                attr_obj = getattr(current, attr)
+                if loader is None:
+                    loader = joinedload(attr_obj)
+                else:
+                    loader = loader.joinedload(attr_obj)
+                current = attr_obj.property.mapper.class_
+            if loader:
+                loads.append(loader)
+        return loads
+
+    def get_join_paths(self):
+        return self.join_paths

crudkit/dsl.py

@@ -1,117 +0,0 @@
-from dataclasses import dataclass, field
-from typing import List, Dict, Any, Optional
-from sqlalchemy import asc, desc, select, false
-from sqlalchemy.inspection import inspect
-
-@dataclass
-class QuerySpec:
-    filters: Dict[str, Any] = field(default_factory=dict)
-    order_by: List[str] = field(default_factory=list)
-    page: Optional[int] = None
-    per_page: Optional[int] = None
-    expand: List[str] = field(default_factory=list)
-    fields: Optional[List[str]] = None
-
-FILTER_OPS = {
-    "__eq": lambda c, v: c == v,
-    "__ne": lambda c, v: c != v,
-    "__lt": lambda c, v: c < v,
-    "__lte": lambda c, v: c <= v,
-    "__gt": lambda c, v: c > v,
-    "__gte": lambda c, v: c >= v,
-    "__ilike": lambda c, v: c.ilike(v),
-    "__in": lambda c, v: c.in_(v),
-    "__isnull": lambda c, v: (c.is_(None) if v else c.is_not(None))
-}
-
-def _split_filter_key(raw_key: str):
-    for op in sorted(FILTER_OPS.keys(), key=len, reverse=True):
-        if raw_key.endswith(op):
-            return raw_key[: -len(op)], op
-    return raw_key, None
-
-def _ensure_wildcards(op_key, value):
-    if op_key == "__ilike" and isinstance(value, str) and "%" not in value and "_" not in value:
-        return f"%{value}%"
-    return value
-
-def _related_predicate(Model, path_parts, op_key, value):
-    """
-    Build EXISTS subqueries for dotted filters:
-      - scalar rels  -> attr.has(inner_predicate)
-      - collection   -> attr.any(inner_predicate)
-    """
-    head, *rest = path_parts
-
-    # class-bound relationship attribute (InstrumentedAttribute)
-    attr = getattr(Model, head, None)
-    if attr is None:
-        return None
-
-    # relationship metadata if you need uselist + target model
-    rel = inspect(Model).relationships.get(head)
-    if rel is None:
-        return None
-    Target = rel.mapper.class_
-
-    if not rest:
-        # filtering directly on a relationship without a leaf column isn't supported
-        return None
-
-    if len(rest) == 1:
-        # final hop is a column on the related model
-        leaf = rest[0]
-        col = getattr(Target, leaf, None)
-        if col is None:
-            return None
-        pred = FILTER_OPS[op_key](col, value) if op_key else (col == value)
-    else:
-        # recurse deeper: owner.room.area.name__ilike=...
-        pred = _related_predicate(Target, rest, op_key, value)
-        if pred is None:
-            return None
-
-    # wrap at this hop using the *attribute*, not the RelationshipProperty
-    return attr.any(pred) if rel.uselist else attr.has(pred)
-
-def build_query(Model, spec: QuerySpec, eager_policy=None):
-    stmt = select(Model)
-
-    # filter out soft-deleted rows
-    deleted_attr = getattr(Model, "deleted", None)
-    if deleted_attr is not None:
-        stmt = stmt.where(deleted_attr == false())
-    else:
-        is_deleted_attr = getattr(Model, "is_deleted", None)
-        if is_deleted_attr is not None:
-            stmt = stmt.where(is_deleted_attr == false())
-
-    # filters
-    for raw_key, val in spec.filters.items():
-        path, op_key = _split_filter_key(raw_key)
-        val = _ensure_wildcards(op_key, val)
-
-        if "." in path:
-            pred = _related_predicate(Model, path.split("."), op_key, val)
-            if pred is not None:
-                stmt = stmt.where(pred)
-            continue
-
-        col = getattr(Model, path, None)
-        if col is None:
-            continue
-        stmt = stmt.where(FILTER_OPS[op_key](col, val) if op_key else (col == val))
-
-    # order_by
-    for key in spec.order_by:
-        desc_ = key.startswith("-")
-        col = getattr(Model, key[1:] if desc_ else key)
-        stmt = stmt.order_by(desc(col) if desc_ else asc(col))
-
-    # eager loading
-    if eager_policy:
-        opts = eager_policy(Model, spec.expand)
-        if opts:
-            stmt = stmt.options(*opts)
-
-    return stmt

crudkit/eager.py

@@ -1,42 +0,0 @@
-from typing import List
-from sqlalchemy.inspection import inspect
-from sqlalchemy.orm import Load, joinedload, selectinload
-
-def default_eager_policy(Model, expand: List[str]) -> List[Load]:
-    """
-    Heuristic:
-      - many-to-one / one-to-one: joinedload
-      - one-to-many / many-to-many: selectinload
-    Accepts dotted paths like "author.publisher".
-    """
-    if not expand:
-        return []
-
-    opts: List[Load] = []
-
-    for path in expand:
-        parts = path.split(".")
-        current_model = Model
-        current_inspect = inspect(current_model)
-
-        # first hop
-        rel = current_inspect.relationships.get(parts[0])
-        if not rel:
-            continue  # silently skip bad names
-        attr = getattr(current_model, parts[0])
-        loader: Load = selectinload(attr) if rel.uselist else joinedload(attr)
-        current_model = rel.mapper.class_
-
-        # nested hops, if any
-        for name in parts[1:]:
-            current_inspect = inspect(current_model)
-            rel = current_inspect.relationships.get(name)
-            if not rel:
-                break
-            attr = getattr(current_model, name)
-            loader = loader.selectinload(attr) if rel.uselist else loader.joinedload(attr)
-            current_model = rel.mapper.class_
-
-        opts.append(loader)
-
-    return opts

crudkit/html/__init__.py

@@ -1,3 +0,0 @@
-from .ui_fragments import make_fragments_blueprint
-
-__all__ = ["make_fragments_blueprint"]

crudkit/html/templates/crudkit/_macros.html

@@ -1,93 +0,0 @@
-{% macro options(items, value_attr="id", label_path="name", getp=None) -%}
-{%- for obj in items -%}
-<option value="{{ getp(obj, value_attr) }}">{{ getp(obj, label_path) }}</option>
-{%- endfor -%}
-{% endmacro %}
-
-{% macro lis(items, label_path="name", sublabel_path=None, getp=None) -%}
-{%- for obj in items -%}
-<li data-id="{{ obj.id }}">
-    <div class="li-main">{{ getp(obj, label_path) }}</div>
-    {%- if sublabel_path %}
-    <div class="li-sub">{{ getp(obj, sublabel_path) }}</div>
-    {%- endif %}
-</li>
-{%- else -%}
-<li class="empty"><em>No results.</em></li>
-{%- endfor -%}
-{% endmacro %}
-
-{% macro rows(items, fields, getp=None) -%}
-{%- for obj in items -%}
-<tr id="row-{{ obj.id }}">
-    {%- for f in fields -%}
-    <td data-field="{{ f }}">{{ getp(obj, f) }}</td>
-    {%- endfor -%}
-</tr>
-{%- else -%}
-<tr>
-    <td colspan="{{ fields|length }}"><em>No results.</em></td>
-</tr>
-{%- endfor -%}
-{%- endmacro %}
-
-{% macro pager(model, page, pages, per_page, sort, filters) -%}
-<nav class="pager">
-    {%- if page > 1 -%}
-    <a hx-get="/{{ model }}/frag/rows?page={{ page-1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{v}}{% endfor %}"
-        hx-target="#rows" hx-push-url="true">Prev</a>
-    {%- endif -%}
-    <span>Page {{ page }} / {{ pages }}</span>
-    {%- if page < pages -%} <a
-        hx-get="/{{ model }}/frag/rows?page={{ page+1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{v}}{% endfor %}"
-        hx-target="#rows" hx-push-url="true">Next</a>
-        {%- endif -%}
-</nav>
-{%- endmacro %}
-
-{% macro form(schema, action, method="POST", obj_id=None, hx=False, csrf_token=None) -%}
-<form action="{{ action }}" method="post" {%- if hx %} hx-{{ "patch" if obj_id else "post" }}="{{ action }}"
-    hx-target="closest dialog, #modal-body, body" hx-swap="innerHTML" hx-disabled-elt="button[type=submit]" {%- endif
-    -%}>
-    {%- if csrf_token %}<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">{% endif -%}
-    {%- if obj_id %}<input type="hidden" name="id" value="{{ obj_id }}">{% endif -%}
-    <input type="hidden" name="fields_csv" value="{{ request.args.get('fields_csv','id,name') }}">
-
-    {%- for f in schema -%}
-    <div class="field" data-name="{{ f.name }}">
-        {% set fid = 'f-' ~ f.name ~ '-' ~ (obj_id or 'new') %}
-        <label for="{{ fid }}">{{ f.label or f.name|replace('_',' ')|title }}</label>
-        {%- if f.type == "textarea" -%}
-        <textarea id="{{ fid }}" name="{{ f.name }}" {%- if f.required %} required{% endif %}{% if f.maxlength %}
-            maxlength="{{ f.maxlength }}" {% endif %}>{{ f.value or "" }}</textarea>
-        {%- elif f.type == "select" -%}
-        <select id="{{ fid }}" name="{{ f.name }}" {% if f.required %}required{% endif %}>
-            <option value="">{{ f.placeholder or ("Choose " ~ (f.label or f.name|replace('_',' ')|title)) }}</option>
-            {% if f.multiple %}
-            {% set selected = (f.value or [])|list %}
-            {% for val, lbl in f.choices %}
-            <option value="{{ val }}" {{ 'selected' if val in selected else '' }}>{{ lbl }}</option>
-            {% endfor %}
-            {% else %}
-            {% for val, lbl in f.choices %}
-            <option value="{{ val }}" {{ 'selected' if (f.value|string)==(val|string) else '' }}>{{ lbl }}</option>
-            {% endfor %}
-            {% endif %}
-        </select>
-        {%- elif f.type == "checkbox" -%}
-        <input type="hidden" name="{{ f.name }}" value="0">
-        <input id="{{ fid }}" type="checkbox" name="{{ f.name }}" value="1" {{ "checked" if f.value else "" }}>
-        {%- else -%}
-        <input id="{{ fid }}" type="{{ f.type }}" name="{{ f.name }}"
-            value="{{ f.value if f.value is not none else '' }}" {%- if f.required %} required{% endif %} {%- if
-            f.maxlength %} maxlength="{{ f.maxlength }}" {% endif %}>
-        {%- endif -%}
-        {%- if f.help %}<div class="help">{{ f.help }}</div>{% endif -%}
-    </div>
-    {%- endfor -%}
-
-    <div class="actions">
-        <button type="submit">Save</button>
-    </div>
-</form>
-{%- endmacro %}

crudkit/html/templates/crudkit/form.html

@@ -1,3 +0,0 @@
-{% import "_macros.html" as ui %}
-{% set action = url_for('frags.save', model=model) %}
-{{ ui.form(schema, action, method="POST", obj_id=obj.id if obj else None, hx=true) }}

crudkit/html/templates/crudkit/lis.html

@@ -1,2 +0,0 @@
-{% import "_macros.html" as ui %}
-{{ ui.lis(items, label_path=label_path, sublabel_path=sublabel_path, getp=getp) }}

crudkit/html/templates/crudkit/options.html

@@ -1,3 +0,0 @@
-{# Renders only <option>...</option> rows #}
-{% import "_macros.html" as ui %}
-{{ ui.options(items, value_attr=value_attr, label_path=label_path, getp=getp) }}

crudkit/html/templates/crudkit/row.html

@@ -1,2 +0,0 @@
-{% import "_macros.html" as ui %}
-{{ ui.rows([obj], fields, getp=getp) }}

crudkit/html/templates/crudkit/rows.html

@@ -1,3 +0,0 @@
-{% import "_macros.html" as ui %}
-{{ ui.rows(items, fields, getp=getp) }}
-{{ ui.pager(model, page, pages, per_page, sort, filters) }}

crudkit/html/type_map.py

@@ -1,137 +0,0 @@
-from __future__ import annotations
-from typing import Any, Dict, List, Optional, Tuple
-from sqlalchemy import select
-from sqlalchemy.inspection import inspect
-from sqlalchemy.orm import Mapper, RelationshipProperty
-from sqlalchemy.sql.schema import Column
-from sqlalchemy.sql.sqltypes import (
-    String, Text, Unicode, UnicodeText,
-    Integer, BigInteger, SmallInteger, Float, Numeric, Boolean,
-    Date, DateTime, Time, JSON, Enum
-)
-
-CANDIDATE_LABELS = ("name", "title", "label", "display_name")
-
-def _guess_label_attr(model_cls) -> str:
-    for cand in CANDIDATE_LABELS:
-        if hasattr(model_cls, cand):
-            return cand
-    return "id"
-
-def _pretty(label: str) -> str:
-    return label.replace("_", " ").title()
-
-def _column_input_type(col: Column) -> str:
-    t = col.type
-    if isinstance(t, (String, Unicode)):
-        return "text"
-    if isinstance(t, (Text, UnicodeText, JSON)):
-        return "textarea"
-    if isinstance(t, (Integer, SmallInteger, BigInteger)):
-        return "number"
-    if isinstance(t, (Float, Numeric)):
-        return "number"
-    if isinstance(t, Boolean):
-        return "checkbox"
-    if isinstance(t, Date):
-        return "date"
-    if isinstance(t, DateTime):
-        return "datetime-local"
-    if isinstance(t, Time):
-        return "time"
-    if isinstance(t, Enum):
-        return "select"
-    return "text"
-
-def _enum_choices(col: Column) -> Optional[List[Tuple[str, str]]]:
-    t = col.type
-    if isinstance(t, Enum):
-        if t.enum_class:
-            return [(e.name, e.value) for e in t.enum_class]
-        if t.enums:
-            return [(v, v) for v in t.enums]
-    return None
-
-def build_form_schema(model_cls, session, obj=None, *, include=None, exclude=None, fk_limit=200):
-    mapper: Mapper = inspect(model_cls)
-    include = set(include or [])
-    exclude = set(exclude or {"id", "created_at", "updated_at", "deleted", "version"})
-    fields = []
-
-    fields: List[Dict[str, Any]] = []
-
-    fk_map = {}
-    for rel in mapper.relationships:
-        for lc in rel.local_columns:
-            fk_map[lc.key] = rel
-
-    for attr in mapper.column_attrs:
-        col = attr.columns[0]
-        name = col.key
-        if include and name not in include:
-            continue
-        if name in exclude:
-            continue
-
-        field = {
-            "name": name,
-            "type": _column_input_type(col),
-            "required": not col.nullable,
-            "value": getattr(obj, name, None) if obj is not None else None,
-            "placeholder": "",
-            "help": "",
-            # default label from column name
-            "label": _pretty(name),
-        }
-
-        enum_choices = _enum_choices(col)
-        if enum_choices:
-            field["type"] = "select"
-            field["choices"] = enum_choices
-
-        if name in fk_map:
-            rel = fk_map[name]
-            target = rel.mapper.class_
-            label_attr = _guess_label_attr(target)
-            rows = session.execute(select(target).limit(fk_limit)).scalars().all()
-            field["type"] = "select"
-            field["choices"] = [(getattr(r, "id"), getattr(r, label_attr)) for r in rows]
-            field["rel"] = {"target": target.__name__, "label_attr": label_attr}
-            field["label"] = _pretty(rel.key)
-
-        if getattr(col.type, "length", None):
-            field["maxlength"] = col.type.length
-
-        fields.append(field)
-
-    for rel in mapper.relationships:
-        if not rel.uselist or rel.secondary is None:
-            continue  # only true many-to-many
-
-        if include and f"{rel.key}_ids" not in include:
-            continue
-
-        target = rel.mapper.class_
-        label_attr = _guess_label_attr(target)
-        choices = session.execute(select(target).limit(fk_limit)).scalars().all()
-
-        current = []
-        if obj is not None:
-            current = [getattr(x, "id") for x in getattr(obj, rel.key, []) or []]
-
-        fields.append({
-            "name": f"{rel.key}_ids",     # e.g. "tags_ids"
-            "label": rel.key.replace("_"," ").title(),
-            "type": "select",
-            "multiple": True,
-            "required": False,
-            "choices": [(getattr(r,"id"), getattr(r,label_attr)) for r in choices],
-            "value": current,             # list of selected IDs
-            "placeholder": f"Choose {rel.key.replace('_',' ').title()}",
-            "help": "",
-        })
-
-    if include:
-        order = list(include)
-        fields.sort(key=lambda f: order.index(f["name"]) if f["name"] in include else 10**9)
-    return fields

crudkit/html/ui_fragments.py

@@ -1,233 +0,0 @@
-from __future__ import annotations
-from typing import Any, Dict, List, Tuple
-from math import ceil
-from flask import Blueprint, request, render_template, abort, make_response
-from sqlalchemy import select
-from sqlalchemy.orm import scoped_session
-from sqlalchemy.inspection import inspect
-from sqlalchemy.sql.sqltypes import Integer, Boolean, Date, DateTime, Float, Numeric
-
-from ..dsl import QuerySpec
-from ..service import CrudService
-from ..eager import default_eager_policy
-from .type_map import build_form_schema
-
-def make_fragments_blueprint(db_session_factory, registry: Dict[str, Any], *, name="frags"):
-    """
-    HTML fragments for HTMX/Alpine. No base pages. Pure partials:
-        GET /<model>/frag/options   -> <option>...</option>
-        GET /<model>/frag/lis       -> <li>...</li>
-        GET /<model>/frag/rows      -> <tr>...</tr> + pager markup if wanted
-        GET /<model>/frag/form      -> <form>...</form> (auto-generated)
-    """
-    bp = Blueprint(name, __name__, template_folder="templates/crudkit")
-    def session(): return scoped_session(db_session_factory)()
-
-    def _parse_filters(args):
-        reserved = {"page", "per_page", "sort", "expand", "fields", "value", "label", "label_tpl", "fields_csv", "li_label", "li_sublabel"}
-        out = {}
-        for k, v in args.items():
-            if k not in reserved and v != "":
-                out[k] = v
-        return out
-
-    def _paths_from_csv(csv: str) -> List[str]:
-        return [p.strip() for p in csv.split(",") if p.strip()]
-
-    def _collect_expand_from_paths(paths: List[str]) -> List[str]:
-        rels = set()
-        for p in paths:
-            bits = p.split(".")
-            if len(bits) > 1:
-                rels.add(bits[0])
-        return list(rels)
-
-    def _getp(obj, path: str):
-        cur = obj
-        for part in path.split("."):
-            cur = getattr(cur, part, None) if cur is not None else None
-        return cur
-
-    def _extract_m2m_lists(Model, req_form) -> dict[str, list[int]]:
-        """Return {'tags': [1,2]} for any <rel>_ids fields; caller removes keys from main form."""
-        mapper = inspect(Model)
-        out = {}
-        for rel in mapper.relationships:
-            if not rel.uselist or rel.secondary is None:
-                continue
-            key = f"{rel.key}_ids"
-            ids = req_form.getlist(key)
-            if ids is None:
-                continue
-            out[rel.key] = [int(i) for i in ids if i]
-        return out
-
-    @bp.get("/<model>/frag/options")
-    def options(model):
-        Model = registry.get(model) or abort(404)
-        value_attr = request.args.get("value", default="id")
-        label_path = request.args.get("label", default="name")
-        filters = _parse_filters(request.args)
-
-        expand = _collect_expand_from_paths([label_path])
-        spec = QuerySpec(filters=filters, order_by=[], page=None, per_page=None, expand=expand)
-        s = session(); svc = CrudService(s, default_eager_policy)
-        items, _ = svc.list(Model, spec)
-
-        return render_template("options.html", items=items, value_attr=value_attr, label_path=label_path, getp=_getp)
-
-    @bp.get("/<model>/frag/lis")
-    def lis(model):
-        Model = registry.get(model) or abort(404)
-        label_path = request.args.get("li_label", default="name")
-        sublabel_path = request.args.get("li_sublabel")
-        filters = _parse_filters(request.args)
-        sort = request.args.get("sort")
-        page = request.args.get("page", type=int)
-        per_page = request.args.get("per_page", type=int)
-
-        expand = _collect_expand_from_paths([p for p in (label_path, sublabel_path) if p])
-        spec = QuerySpec(filters=filters, order_by=[sort] if sort else [], page=page, per_page=per_page, expand=expand)
-        s = session(); svc = CrudService(s, default_eager_policy)
-        rows, total = svc.list(Model, spec)
-        pages = (ceil(total / per_page) if page and per_page else 1)
-        return render_template("lis.html", items=rows, label_path=label_path, sublabel_path=sublabel_path, page=page or 1, per_page=per_page or 1, total=total, model=model, sort=sort, filters=filters, getp=_getp)
-
-    @bp.get("/<model>/frag/rows")
-    def rows(model):
-        Model = registry.get(model) or abort(404)
-        fields_csv = request.args.get("fields_csv") or "id,name"
-        fields = _paths_from_csv(fields_csv)
-        filters = _parse_filters(request.args)
-        sort = request.args.get("sort")
-        page = request.args.get("page", type=int) or 1
-        per_page = request.args.get("per_page", type=int) or 20
-
-        expand = _collect_expand_from_paths(fields)
-        spec = QuerySpec(filters=filters, order_by=[sort] if sort else [], page=page, per_page=per_page, expand=expand)
-        s = session(); svc = CrudService(s, default_eager_policy)
-        rows, total = svc.list(Model, spec)
-        pages = max(1, ceil(total / per_page))
-        return render_template("rows.html", items=rows, fields=fields, page=page, pages=pages, per_page=per_page, total=total, model=model, sort=sort, filters=filters, getp=_getp)
-
-    @bp.get("/<model>/frag/form")
-    def form(model):
-        Model = registry.get(model) or abort(404)
-        id = request.args.get("id", type=int)
-        include_csv = request.args.get("include")
-        include = [s.strip() for s in include_csv.split(",")] if include_csv else None
-
-        s = session(); svc = CrudService(s, default_eager_policy)
-        obj = svc.get(Model, id) if id else None
-
-        schema = build_form_schema(Model, s, obj=obj, include=include)
-
-        hx = request.args.get("hx", type=int) == 1
-        return render_template("form.html", model=model, obj=obj, schema=schema, hx=hx)
-
-    def coerce_form_types(Model, data: dict) -> dict:
-        """Turn HTML string inputs into the Python types your columns expect."""
-        mapper = inspect(Model)
-        for attr in mapper.column_attrs:
-            col = attr.columns[0]
-            name = col.key
-            if name not in data:
-                continue
-            v = data[name]
-            if v == "":
-                data[name] = None
-                continue
-            t = col.type
-            try:
-                if isinstance(t, Boolean):
-                    data[name] = v in ("1", "true", "on", "yes", True)
-                elif isinstance(t, Integer):
-                    data[name] = int(v)
-                elif isinstance(t, (Float, Numeric)):
-                    data[name] = float(v)
-                elif isinstance(t, DateTime):
-                    from datetime import datetime
-                    data[name] = datetime.fromisoformat(v)
-                elif isinstance(t, Date):
-                    from datetime import date
-                    data[name] = date.fromisoformat(v)
-            except Exception:
-                # Leave as string; your validator can complain later.
-                pass
-        return data
-
-    @bp.post("/<model>/frag/save")
-    def save(model):
-        Model = registry.get(model) or abort(404)
-        s = session(); svc = CrudService(s, default_eager_policy)
-
-        # grab the raw form and fields to re-render
-        raw = request.form
-        form = raw.to_dict(flat=True)
-        fields_csv = form.pop("fields_csv", "id,name")
-
-        # many-to-many lists first
-        m2m = _extract_m2m_lists(Model, raw)
-        for rel_name in list(m2m.keys()):
-            form.pop(f"{rel_name}_ids", None)
-
-        # coerce primitives for regular columns
-        form = coerce_form_types(Model, form)
-
-        id_val = form.pop("id", None)
-
-        if id_val:
-            obj = svc.get(Model, int(id_val)) or abort(404)
-            svc.update(obj, form)
-        else:
-            obj = svc.create(Model, form)
-
-        # apply many-to-many selections
-        mapper = inspect(Model)
-        for rel_name, id_list in m2m.items():
-            rel = mapper.relationships[rel_name]
-            target = rel.mapper.class_
-            selected = []
-            if id_list:
-                selected = s.execute(select(target).where(target.id.in_(id_list))).scalars().all()
-            coll = getattr(obj, rel_name)
-            coll.clear()
-            coll.extend(selected)
-
-        s.commit()
-
-        rows_html = render_template(
-            "crudkit/row.html",
-            obj=obj,
-            fields=[p.strip() for p in fields_csv.split(",") if p.strip()],
-            getp=_getp,
-        )
-        resp = make_response(rows_html)
-        if id_val:
-            resp.headers["HX-Trigger"] = '{"toast":{"level":"success","message":"Updated"}}'
-            resp.headers["HX-Retarget"] = f"#row-{obj.id}"
-            resp.headers["HX-Reswap"] = "outerHTML"
-        else:
-            resp.headers["HX-Trigger"] = '{"toast":{"level":"success","message":"Created"}}'
-            resp.headers["HX-Retarget"] = "#rows"
-            resp.headers["HX-Reswap"] = "beforeend"
-        return resp
-
-    @bp.get("/_debug/<model>/schema")
-    def debug_model(model):
-        Model = registry[model]
-        from sqlalchemy.inspection import inspect
-        m = inspect(Model)
-        return {
-            "columns": [c.key for c in m.columns],
-            "relationships": [
-                {
-                    "key": r.key,
-                    "target": r.mapper.class_.__name__,
-                    "uselist": r.uselist,
-                    "local_cols": [c.key for c in r.local_columns],
-                } for r in m.relationships
-            ],
-        }
-    return bp
-

crudkit/mixins.py

@@ -1,23 +0,0 @@
-import datetime as dt
-from sqlalchemy import Column, Integer, DateTime, Boolean
-from sqlalchemy.orm import declared_attr
-from sqlalchemy.ext.hybrid import hybrid_property
-
-class CrudMixin:
-    id = Column(Integer, primary_key=True)
-    created_at = Column(DateTime, default=dt.datetime.utcnow, nullable=False)
-    updated_at = Column(DateTime, default=dt.datetime.utcnow, onupdate=dt.datetime.utcnow, nullable=False)
-    deleted = Column("deleted", Boolean, default=False, nullable=False)
-    version = Column(Integer, default=1, nullable=False)
-
-    @hybrid_property
-    def is_deleted(self):
-        return self.deleted
-
-    def mark_deleted(self):
-        self.deleted = True
-        self.version += 1
-
-    @declared_attr
-    def __mapper_args__(cls):
-        return {"version_id_col": cls.version}

crudkit/serialize.py

@@ -1,22 +0,0 @@
-def serialize(obj, *, fields=None, expand=None):
-    expand = set(expand or [])
-    fields = set(fields or [])
-    out = {}
-    # base columns
-    for col in obj.__table__.columns:
-        name = col.key
-        if fields and name not in fields:
-            continue
-        out[name] = getattr(obj, name)
-    # expansions
-    for rel in obj.__mapper__.relationships:
-        if rel.key not in expand:
-            continue
-        val = getattr(obj, rel.key)
-        if val is None:
-            out[rel.key] = None
-        elif rel.uselist:
-            out[rel.key] = [serialize(child) for child in val]
-        else:
-            out[rel.key] = serialize(val)
-    return out

crudkit/service.py

@@ -1,52 +0,0 @@
-from sqlalchemy import func
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import Session
-
-from .dsl import QuerySpec, build_query
-from .eager import default_eager_policy
-
-class CrudService:
-    def __init__(self, session: Session, eager_policy=default_eager_policy):
-        self.s = session
-        self.eager_policy = eager_policy
-
-    def create(self, Model, data, *, before=None, after=None):
-        if before: data = before(data) or data
-        obj = Model(**data)
-        self.s.add(obj)
-        self.s.flush()
-        if after: after(obj)
-        return obj
-
-    def get(self, Model, id, spec: QuerySpec | None = None):
-        spec = spec or QuerySpec()
-        stmt = build_query(Model, spec, self.eager_policy).where(Model.id == id)
-        return self.s.execute(stmt).scalars().first()
-
-    def list(self, Model, spec: QuerySpec):
-        stmt = build_query(Model, spec, self.eager_policy)
-        count_stmt = stmt.with_only_columns(func.count()).order_by(None)
-        total = self.s.execute(count_stmt).scalar_one()
-        if spec.page and spec.per_page:
-            stmt = stmt.limit(spec.per_page).offset((spec.page - 1) * spec.per_page)
-        rows = self.s.execute(stmt).scalars().all()
-        return rows, total
-
-    def update(self, obj, data, *, before=None, after=None):
-        if obj.is_deleted: raise ValueError("Cannot update a deleted record")
-        if before: data = before(obj, data) or data
-        for k, v in data.items(): setattr(obj, k, v)
-        obj.version += 1
-        if after: after(obj)
-        return obj
-
-    def soft_delete(self, obj, *, cascade=False, guard=None):
-        if guard and not guard(obj): raise ValueError("Delete blocked by guard")
-        # optionsl FK hygiene checks go here
-        obj.mark_deleted()
-        return obj
-
-    def undelete(self, obj):
-        obj.deleted = False
-        obj.version += 1
-        return obj

crudkit/ui/fragments.py

@@ -0,0 +1,81 @@
+from jinja2 import Environment, FileSystemLoader, ChoiceLoader
+from sqlalchemy.orm import class_mapper, RelationshipProperty
+from flask import current_app
+import os
+
+def get_env():
+    app_loader = current_app.jinja_loader
+
+    default_path = os.path.join(os.path.dirname(__file__), 'templates')
+    fallback_loader = FileSystemLoader(default_path)
+
+    env = Environment(loader=ChoiceLoader([
+        app_loader,
+        fallback_loader
+    ]))
+    return env
+
+def get_crudkit_template(env, name):
+    try:
+        return env.get_template(f'crudkit/{name}')
+    except Exception:
+        return env.get_template(name)
+
+def render_field(field, value):
+    env = get_env()
+    template = get_crudkit_template(env, 'field.html')
+    return template.render(
+        field_name=field['name'],
+        field_label=field.get('label', field['name']),
+        value=value,
+        field_type=field.get('type', 'text'),
+        options=field.get('options', None)
+    )
+
+def render_table(objects):
+    env = get_env()
+    template = get_crudkit_template(env, 'table.html')
+    return template.render(objects=objects)
+
+def render_form(model_cls, values, session=None):
+    env = get_env()
+    template = get_crudkit_template(env, 'form.html')
+    fields = []
+    fk_fields = set()
+
+    mapper = class_mapper(model_cls)
+    for prop in mapper.iterate_properties:
+        # FK Relationship fields (many-to-one)
+        if isinstance(prop, RelationshipProperty) and prop.direction.name == 'MANYTOONE':
+            if session is None:
+                continue
+
+            related_model = prop.mapper.class_
+            options = session.query(related_model).all()
+            fields.append({
+                'name': f"{prop.key}_id",
+                'label': prop.key,
+                'type': 'select',
+                'options': [
+                    {'value': getattr(obj, 'id'), 'label': str(obj)}
+                    for obj in options
+                ]
+            })
+            fk_fields.add(f"{prop.key}_id")
+
+    # Now add basic columns — excluding FKs already covered
+    for col in model_cls.__table__.columns:
+        if col.name in fk_fields:
+            continue
+        if col.name in ('id', 'created_at', 'updated_at'):
+            continue
+        if col.default or col.server_default or col.onupdate:
+            continue
+        fields.append({
+            'name': col.name,
+            'label': col.name,
+            'type': 'text',
+        })
+
+    return template.render(fields=fields, values=values, render_field=render_field)
+

crudkit/ui/templates/field.html

@@ -0,0 +1,16 @@
+<label for="{{ field_name }}">{{ field_label }}</label>
+
+{% if field_type == 'select' %}
+    <select name="{{ field_name }}" {%- if not options %}disabled{% endif %}>
+        {% if options %}
+            <option value="">-- Select --</option>
+            {% for opt in options %}
+                <option value="{{ opt.value }}" {% if opt.value|string == value|string %}selected{% endif %}>{{ opt.label }}</option>
+            {% endfor %}
+        {% else %}
+            <option value="">-- No selection available --</option>
+        {% endif %}
+    </select>
+{% else %}
+    <input type="text" name="{{ field_name }}" value="{{ value }}">
+{% endif %}

crudkit/ui/templates/form.html

@@ -0,0 +1,6 @@
+<form method="POST">
+    {% for field in fields %}
+        {{ render_field(field, values.get(field.name, '')) }}
+    {% endfor %}
+    <button type="submit">Create</button>
+</form>

crudkit/ui/templates/table.html

@@ -0,0 +1,12 @@
+<table>
+    {% if objects %}
+        <tr>
+            {% for field in objects[0].__table__.columns %}<th>{{ field.name }}</th>{% endfor %}
+        </tr>
+        {% for obj in objects %}
+            <tr>{% for field in obj.__table__.columns %}<td>{{ obj[field.name] }}</td>{% endfor %}</tr>
+        {% endfor %}
+    {% else %}
+        <tr><th>No data.</th></tr>
+    {% endif %}
+</table>