Deploy AIOS web (React glide grid + FastAPI slice)
Browse files- RELEASES.json +1 -1
- VERSION +1 -1
- api/routes_odoo_tables.py +3 -2
- api/routes_sheet.py +3 -1
- platform/modules/sheet.py +8 -6
- web/public/AIOS_DEPLOY_RECEIPT +1 -1
RELEASES.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
{
|
| 2 |
-
"current": "
|
| 3 |
"releases": []
|
| 4 |
}
|
|
|
|
| 1 |
{
|
| 2 |
+
"current": "af7046b4d",
|
| 3 |
"releases": []
|
| 4 |
}
|
VERSION
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
|
|
|
|
| 1 |
+
af7046b4d
|
api/routes_odoo_tables.py
CHANGED
|
@@ -4583,9 +4583,10 @@ def _sql_link_cells(session, target, on, values, *, st, single, remaining, read=
|
|
| 4583 |
"""Reduce scoped target identities in SQL; refuse bytes before string aggregation."""
|
| 4584 |
read = read if read is not None else _compiled_read(target, session, st=st)
|
| 4585 |
spec, cur = read['spec'], read['cur']
|
| 4586 |
-
|
|
|
|
| 4587 |
raise err(409, 'relation_target_unavailable', 'A required relation column is unavailable.')
|
| 4588 |
-
expr = f'LOWER(TRIM(CAST({
|
| 4589 |
wanted = _membership_relation(cur, values, normalize=str, sql_type='VARCHAR')
|
| 4590 |
lease = _RelationLease(cur)
|
| 4591 |
name = lease.table('_link_values')
|
|
|
|
| 4583 |
"""Reduce scoped target identities in SQL; refuse bytes before string aggregation."""
|
| 4584 |
read = read if read is not None else _compiled_read(target, session, st=st)
|
| 4585 |
spec, cur = read['spec'], read['cur']
|
| 4586 |
+
bindings = dict(spec['cols'], pid=(spec['id'], int))
|
| 4587 |
+
if on not in bindings:
|
| 4588 |
raise err(409, 'relation_target_unavailable', 'A required relation column is unavailable.')
|
| 4589 |
+
expr = f'LOWER(TRIM(CAST({bindings[on][0]} AS VARCHAR)))'
|
| 4590 |
wanted = _membership_relation(cur, values, normalize=str, sql_type='VARCHAR')
|
| 4591 |
lease = _RelationLease(cur)
|
| 4592 |
name = lease.table('_link_values')
|
api/routes_sheet.py
CHANGED
|
@@ -5798,6 +5798,8 @@ def _binding_related_query(session, database, entry, cur, spec, columns, *, fiel
|
|
| 5798 |
f"'{database}'. Retry after both databases share a connection.")
|
| 5799 |
hidden = perm_scope.hidden_keys(session.user, target, rspec.get("fields") or [],
|
| 5800 |
st=session.runtime)
|
|
|
|
|
|
|
| 5801 |
rcols = {key: value for key, value in rcols.items() if key not in hidden}
|
| 5802 |
declared = {field["key"]: field for field in rspec.get("fields") or []}
|
| 5803 |
|
|
@@ -5819,7 +5821,7 @@ def _binding_related_query(session, database, entry, cur, spec, columns, *, fiel
|
|
| 5819 |
raise unknown_field(key)
|
| 5820 |
return {"via": name, "database": target, "local_key": local_key, "remote_key": remote_key,
|
| 5821 |
"spec": rspec, "columns": rcols, "where": entry.get("where"),
|
| 5822 |
-
"wall_nodes": wall_nodes, "wall_conj": wall_conj,
|
| 5823 |
"limits": [row for key, row in (rspec.get("unbounded") or {}).items() if key in fields]}
|
| 5824 |
|
| 5825 |
|
|
|
|
| 5798 |
f"'{database}'. Retry after both databases share a connection.")
|
| 5799 |
hidden = perm_scope.hidden_keys(session.user, target, rspec.get("fields") or [],
|
| 5800 |
st=session.runtime)
|
| 5801 |
+
# The far-side wall compiles against the full map: a wall column is often hidden from its reader.
|
| 5802 |
+
wall_cols = dict(rcols)
|
| 5803 |
rcols = {key: value for key, value in rcols.items() if key not in hidden}
|
| 5804 |
declared = {field["key"]: field for field in rspec.get("fields") or []}
|
| 5805 |
|
|
|
|
| 5821 |
raise unknown_field(key)
|
| 5822 |
return {"via": name, "database": target, "local_key": local_key, "remote_key": remote_key,
|
| 5823 |
"spec": rspec, "columns": rcols, "where": entry.get("where"),
|
| 5824 |
+
"wall_nodes": wall_nodes, "wall_conj": wall_conj, "wall_columns": wall_cols,
|
| 5825 |
"limits": [row for key, row in (rspec.get("unbounded") or {}).items() if key in fields]}
|
| 5826 |
|
| 5827 |
|
platform/modules/sheet.py
CHANGED
|
@@ -1179,7 +1179,7 @@ def _related_predicate(related, columns, *, today=None, cohort_sets=None):
|
|
| 1179 |
where = [f"({part})" for part in (rspec.get("where"), related.get("where")) if part]
|
| 1180 |
params, limits = [], []
|
| 1181 |
|
| 1182 |
-
def leaf_limits(nodes):
|
| 1183 |
# Checking every leaf also catches a dropped condition on a column which a
|
| 1184 |
# different, valid condition used. The legacy column-set check cannot see it.
|
| 1185 |
out = []
|
|
@@ -1187,19 +1187,21 @@ def _related_predicate(related, columns, *, today=None, cohort_sets=None):
|
|
| 1187 |
if not isinstance(node, dict):
|
| 1188 |
raise ValueError("malformed related filter condition")
|
| 1189 |
if isinstance(node.get("children"), list):
|
| 1190 |
-
out.extend(leaf_limits(node["children"]))
|
| 1191 |
else:
|
| 1192 |
if "children" in node or not node.get("colId"):
|
| 1193 |
raise ValueError("malformed related filter condition")
|
| 1194 |
-
part = compile_scope([node], "and",
|
| 1195 |
-
out.extend(widen_limits([node],
|
| 1196 |
return out
|
| 1197 |
|
| 1198 |
for nodes, conj, is_wall in (
|
| 1199 |
(related.get("wall_nodes"), related.get("wall_conj", "and"), True),
|
| 1200 |
(related["scope_nodes"], related["scope_conj"], False)):
|
| 1201 |
-
|
| 1202 |
-
|
|
|
|
|
|
|
| 1203 |
if is_wall and dropped:
|
| 1204 |
raise ValueError("unapplied related row wall")
|
| 1205 |
limits.extend({**item, "subject": f"{related['database']}: {item['subject']}"}
|
|
|
|
| 1179 |
where = [f"({part})" for part in (rspec.get("where"), related.get("where")) if part]
|
| 1180 |
params, limits = [], []
|
| 1181 |
|
| 1182 |
+
def leaf_limits(nodes, cmap):
|
| 1183 |
# Checking every leaf also catches a dropped condition on a column which a
|
| 1184 |
# different, valid condition used. The legacy column-set check cannot see it.
|
| 1185 |
out = []
|
|
|
|
| 1187 |
if not isinstance(node, dict):
|
| 1188 |
raise ValueError("malformed related filter condition")
|
| 1189 |
if isinstance(node.get("children"), list):
|
| 1190 |
+
out.extend(leaf_limits(node["children"], cmap))
|
| 1191 |
else:
|
| 1192 |
if "children" in node or not node.get("colId"):
|
| 1193 |
raise ValueError("malformed related filter condition")
|
| 1194 |
+
part = compile_scope([node], "and", cmap, today=today, cohort_sets=cohort_sets)
|
| 1195 |
+
out.extend(widen_limits([node], cmap, part))
|
| 1196 |
return out
|
| 1197 |
|
| 1198 |
for nodes, conj, is_wall in (
|
| 1199 |
(related.get("wall_nodes"), related.get("wall_conj", "and"), True),
|
| 1200 |
(related["scope_nodes"], related["scope_conj"], False)):
|
| 1201 |
+
# A wall reads the reader's hidden columns too; authored conditions never do.
|
| 1202 |
+
cmap = (related.get("wall_columns") or rcols) if is_wall else rcols
|
| 1203 |
+
compiled = compile_scope(nodes, conj, cmap, today=today, cohort_sets=cohort_sets)
|
| 1204 |
+
dropped = leaf_limits(nodes, cmap)
|
| 1205 |
if is_wall and dropped:
|
| 1206 |
raise ValueError("unapplied related row wall")
|
| 1207 |
limits.extend({**item, "subject": f"{related['database']}: {item['subject']}"}
|
web/public/AIOS_DEPLOY_RECEIPT
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
|
|
|
|
| 1 |
+
6832facdb8f4c431caf7b3dcda7bb87adf8adad9d668478add78e705ac507f66
|