yaro/inventory
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding some enhancements.

Browse source
This commit is contained in:
Yaro Kasear 2025-09-11 10:47:44 -05:00
parent 013d1c0bd5
commit a8b07eb115
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crudkit/core/service.py
View file

@ -1,5 +1,6 @@
from typing import Type, TypeVar, Generic, Optional
from sqlalchemy.orm import Load, Session, raiseload, with_polymorphic
from sqlalchemy.orm.attributes import InstrumentedAttribute
from sqlalchemy import inspect, text
from crudkit.core.base import Version
from crudkit.core.spec import CRUDSpec
@ -55,6 +56,7 @@ class CRUDService(Generic[T]):
query, root_alias = self.get_query()
root_fields = []
root_field_names = {}
rel_field_names = {}
if params:
@ -77,10 +79,11 @@ class CRUDService(Generic[T]):
)
if params:
root_fields, rel_field_names = spec.parse_fields()
root_fields, rel_field_names, root_field_names = spec.parse_fields()
if root_fields:
query = query.options(Load(root_alias).load_only(*root_fields))
only_cols = [c for c in root_fields if isinstance(c, InstrumentedAttribute)]
if only_cols:
query = query.options(Load(root_alias).load_only(*only_cols))
for eager in spec.get_eager_loads(root_alias, fields_map=rel_field_names):
query = query.options(eager)
@ -105,6 +108,8 @@ class CRUDService(Generic[T]):
rows = query.all()
proj = []
if root_field_names:
proj.extend(root_field_names)
if root_fields:
proj.extend(c.key for c in root_fields)
for path, names in (rel_field_names or {}).items():

6
crudkit/core/spec.py
View file

@ -121,7 +121,7 @@ class CRUDSpec:
"""
raw = self.params.get('fields')
if not raw:
return [], {}
return [], {}, {}
if isinstance(raw, list):
tokens = []
@ -131,6 +131,7 @@ class CRUDSpec:
tokens = [p.strip() for p in str(raw).split(',') if p.strip()]
root_fields: List[InstrumentedAttribute] = []
root_field_names: list[str] = []
rel_field_names: Dict[Tuple[str, ...], List[str]] = {}
for token in tokens:
@ -142,6 +143,7 @@ class CRUDSpec:
self.eager_paths.add(join_path)
else:
root_fields.append(col)
root_field_names.append(getattr(col, "key", token))
seen = set()
root_fields = [c for c in root_fields if not (c.key in seen or seen.add(c.key))]
@ -151,7 +153,7 @@ class CRUDSpec:
self._root_fields = root_fields
self._rel_field_names = rel_field_names
return root_fields, rel_field_names
return root_fields, rel_field_names, root_field_names
def get_eager_loads(self, root_alias, *, fields_map=None):
loads = []