Getting more patch logic in.
This commit is contained in:
Yaro Kasear
parent
cab35b72ec
commit
c040ff74c9
5 changed files with 196 additions and 175 deletions
|
|
@ -5,169 +5,10 @@ from typing import Any, Dict, List, Tuple, Callable, Optional
|
|||
|
||||
import crudkit
|
||||
from crudkit.ui.fragments import render_form
|
||||
|
||||
ISO_DT_FORMATS = ("%Y-%m-%dT%H:%M:%S.%f", "%Y-%m-%dT%H:%M:%S", "%Y-%m-%d %H:%M", "%Y-%m-%d")
|
||||
from crudkit.core import normalize_payload
|
||||
|
||||
bp_entry = Blueprint("entry", __name__)
|
||||
|
||||
def filter_to_columns(data: dict, model_cls):
|
||||
cols = {c.key for c in inspect(model_cls).mapper.columns}
|
||||
return {k: v for k, v in data.items() if k in cols}
|
||||
|
||||
def _parse_dt_maybe(x: Any) -> Any:
|
||||
if isinstance(x, datetime):
|
||||
return x
|
||||
if isinstance(x, str):
|
||||
s = x.strip()
|
||||
for fmt in ISO_DT_FORMATS:
|
||||
try:
|
||||
return datetime.strptime(s, fmt)
|
||||
except ValueError:
|
||||
pass
|
||||
try:
|
||||
return datetime.fromisoformat(s)
|
||||
except Exception:
|
||||
return x
|
||||
return x
|
||||
|
||||
def _normalize_for_compare(x: Any) -> Any:
|
||||
if isinstance(x, (str, datetime)):
|
||||
return _parse_dt_maybe(x)
|
||||
return x
|
||||
|
||||
def deep_diff(
|
||||
old: Any,
|
||||
new: Any,
|
||||
*,
|
||||
path: str = "",
|
||||
ignore_keys: Optional[set] = None,
|
||||
list_mode: str = "index", # "index" or "set"
|
||||
custom_equal: Optional[Callable[[str, Any, Any], bool]] = None,
|
||||
) -> Dict[str, Dict[str, Any]]:
|
||||
"""
|
||||
Returns {'added': {...}, 'removed': {...}, 'changed': {...}}
|
||||
Paths use dot notation for dicts and [i] for lists.
|
||||
"""
|
||||
if ignore_keys is None:
|
||||
ignore_keys = set()
|
||||
|
||||
out: Dict[str, Dict[str, Any]] = {"added": {}, "removed": {}, "changed": {}}
|
||||
|
||||
def mark_changed(p, a, b):
|
||||
out["changed"][p] = {"from": a, "to": b}
|
||||
|
||||
def rec(o, n, pfx):
|
||||
# custom equality short-circuit
|
||||
if custom_equal and custom_equal(pfx.rstrip("."), o, n):
|
||||
return
|
||||
|
||||
# Dict vs Dict
|
||||
if isinstance(o, dict) and isinstance(n, dict):
|
||||
o_keys = set(o.keys())
|
||||
n_keys = set(n.keys())
|
||||
|
||||
# removed
|
||||
for k in sorted(o_keys - n_keys):
|
||||
if k in ignore_keys:
|
||||
continue
|
||||
out["removed"][f"{pfx}{k}"] = o[k]
|
||||
|
||||
# added
|
||||
for k in sorted(n_keys - o_keys):
|
||||
if k in ignore_keys:
|
||||
continue
|
||||
out["added"][f"{pfx}{k}"] = n[k]
|
||||
|
||||
# present in both -> recurse
|
||||
for k in sorted(o_keys & n_keys):
|
||||
if k in ignore_keys:
|
||||
continue
|
||||
rec(o[k], n[k], f"{pfx}{k}.")
|
||||
|
||||
return
|
||||
|
||||
# List vs List
|
||||
if isinstance(o, list) and isinstance(n, list):
|
||||
if list_mode == "set":
|
||||
if set(o) != set(n):
|
||||
mark_changed(pfx.rstrip("."), o, n)
|
||||
else:
|
||||
max_len = max(len(o), len(n))
|
||||
for i in range(max_len):
|
||||
key = f"{pfx}[{i}]"
|
||||
if i >= len(o):
|
||||
out["added"][key] = n[i]
|
||||
elif i >= len(n):
|
||||
out["removed"][key] = o[i]
|
||||
else:
|
||||
rec(o[i], n[i], f"{key}.")
|
||||
return
|
||||
|
||||
# Scalars or type mismatch
|
||||
a = _normalize_for_compare(o)
|
||||
b = _normalize_for_compare(n)
|
||||
if a != b:
|
||||
mark_changed(pfx.rstrip("."), o, n)
|
||||
|
||||
rec(old, new, path)
|
||||
return out
|
||||
|
||||
def diff_to_patch(diff: Dict[str, Dict[str, Any]]) -> Dict[str, Any]:
|
||||
"""
|
||||
Produce a shallow patch of changed/added top-level fields.
|
||||
Onky includes leaf paths without dots/brackets; useful for simple UPDATEs.
|
||||
"""
|
||||
patch = {}
|
||||
for k, v in diff["added"].items():
|
||||
if "." not in k and "[" not in k:
|
||||
patch[k] = v
|
||||
for k, v in diff["changed"].items():
|
||||
if "." not in k and "[" not in k:
|
||||
patch[k] = v["to"]
|
||||
return patch
|
||||
|
||||
def normalize_payload(payload: dict, model):
|
||||
"""
|
||||
Take raw JSON dict from frontend and coerce valies
|
||||
into types expected by the SQLAlchemy model.
|
||||
"""
|
||||
out = {}
|
||||
for field, value in payload.items():
|
||||
if value == "" or value is None:
|
||||
out[field] = None
|
||||
continue
|
||||
|
||||
# Look up the SQLAlchemy column type if available
|
||||
col = getattr(model, field, None)
|
||||
coltype = getattr(col, "type", None)
|
||||
|
||||
if coltype is not None:
|
||||
tname = coltype.__class__.__name__.lower()
|
||||
|
||||
if "integer" in tname:
|
||||
out[field] = int(value)
|
||||
|
||||
elif "boolean" in tname:
|
||||
# frontend may send true/false already,
|
||||
# or string "true"/"false"
|
||||
if isinstance(value, bool):
|
||||
out[field] = value
|
||||
else:
|
||||
out[field] = str(value).lower() in ("1", "true", "yes", "on")
|
||||
|
||||
elif "datetime" in tname:
|
||||
out[field] = (
|
||||
value if isinstance(value, datetime)
|
||||
else datetime.fromisoformat(value)
|
||||
)
|
||||
|
||||
else:
|
||||
out[field] = value
|
||||
else:
|
||||
out[field] = value
|
||||
|
||||
return out
|
||||
|
||||
def init_entry_routes(app):
|
||||
|
||||
@bp_entry.get("/entry/<model>/<int:id>")
|
||||
|
|
@ -357,10 +198,6 @@ def init_entry_routes(app):
|
|||
|
||||
service = crudkit.crud.get_service(cls)
|
||||
item = service.get(id, params)
|
||||
d = deep_diff(item.as_dict(), payload, ignore_keys={"id", "created_at", "updated_at"})
|
||||
patch = diff_to_patch(d)
|
||||
clean_patch = filter_to_columns(patch, cls)
|
||||
print(f"OLD = {item.as_dict()}\n\nNEW = {payload}\n\nDIFF = {d}\n\nPATCH = {patch}\n\nCLEAN PATCH = {clean_patch}")
|
||||
|
||||
return {"status": "success", "payload": payload}
|
||||
except Exception as e:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue