fix(django): only parse tiles when accessed

arches_orm/arches_django/datatypes/resource_instances.py

@@ -79,7 +79,9 @@ def resource_instance(
  else:
  return None
 
- if not isinstance(resource_instance, WKRI):
+ if not resource_instance:
+ return None
+ elif not isinstance(resource_instance, WKRI):
  wkrm = get_well_known_resource_model_by_graph_id(
  resource_instance.graph_id, default=None
  )

arches_orm/arches_django/pseudo_nodes.py

@@ -106,6 +106,8 @@ def __init__(self, node, tile=None, value=None, parent=None, child_nodes=None, p
  self._parent_node = None
  self._child_nodes = child_nodes
  self._value = value
+ self._accessed = False
+ self._original_tile = tile
 
  def __str__(self):
  return f"{{{self.value}}}"
@@ -147,7 +149,13 @@ def clear(self):
  if self.tile and self.tile.data and str(self.node.nodeid) in self.tile.data:
  del self.tile.data[str(self.node.nodeid)]
 
+ @property
+ def accessed(self) -> bool:
+ return self._accessed
+
  def _update_value(self):
+ self._accessed = True
+
  if not self.tile:
  if not self.node:
  raise RuntimeError("Empty tile")

arches_orm/arches_django/wrapper.py

@@ -47,14 +47,22 @@ def _update_tiles(
  if not isinstance(root, PseudoNodeList):
  parent = root
  for pseudo_node in root.get_children():
- if len(pseudo_node):
- subrelationships = self._update_tiles(
- tiles, root=pseudo_node, parent=parent
- )
- relationships += subrelationships
- if not isinstance(pseudo_node, PseudoNodeList):
- t_and_r = pseudo_node.get_tile()
- combined_tiles.append(t_and_r)
+ if pseudo_node.accessed:
+ if len(pseudo_node):
+ subrelationships = self._update_tiles(
+ tiles, root=pseudo_node, parent=parent
+ )
+ relationships += subrelationships
+ if not isinstance(pseudo_node, PseudoNodeList):
+ t_and_r = pseudo_node.get_tile()
+ combined_tiles.append(t_and_r)
+ # This avoids loading a tile as a set of view models, simply to re-save it.
+ elif not isinstance(pseudo_node, PseudoNodeList) and pseudo_node._original_tile:
+ # TODO: NOTE THAT THIS DOES NOT CAPTURE RELATIONSHIPS THAT HAVE NOT BEEN ACCESSED
+ combined_tiles.append((
+ pseudo_node._original_tile,
+ []
+ ))
 
  for tile, subrelationships in combined_tiles:
  if tile:

arches_orm/view_models/resources.py

@@ -39,6 +39,9 @@ def append(self, item: str | uuid.UUID | WKRI):
  resource_instance_id = item["resourceId"]
 
  value, _, __, ___ = self._make_ri_cb(resource_instance or resource_instance_id)
+
+ if not value:
+ raise RuntimeError(f"Could not append {item} to resource list within {self._parent_wkri}")
  if str(value._cross_record["wkriFrom"].id) != str(self._parent_wkri.id):
  raise NotImplementedError("Cannot currently reparent related resources")