Skip to content

Graph-Native Infrastructure for Context and Accountable AI Systems

merge: resolve main conflicts for PR #394

OpenAI Codexe13ea740cd08
diff --cc semantica/change_management/managers.py
index de1bdb3a,b236dd3d..0654b289
--- a/semantica/change_management/managers.py
+++ b/semantica/change_management/managers.py
@@@ -159,13 -160,8 +161,9 @@@ class TemporalVersionManager(BaseVersio
"metadata": options.get("metadata", {}),
}
- # Compute and add checksum
snapshot["checksum"] = compute_checksum(snapshot)
-
- # Store snapshot
self.storage.save(snapshot)
+ self.storage.assign_version_to_unlabeled_mutations(version_label)
-
self.logger.info(f"Created snapshot '{version_label}' by {author}")
return snapshot
diff --cc semantica/change_management/version_storage.py
index 98074784,c7e84ca9..c272622b
--- a/semantica/change_management/version_storage.py
+++ b/semantica/change_management/version_storage.py
@@@ -52,8 -51,7 +52,6 @@@ def _snapshot_collections(snapshot: Dic
return list(entities or []), list(relationships or [])
-
--
def create_graph_snapshot_record(
version_id: str,
graph_uri: str,
diff --cc semantica/context/context_graph.py
index 50804cf3,d527bd88..0170b8bf
--- a/semantica/context/context_graph.py
+++ b/semantica/context/context_graph.py
@@@ -438,37 -448,35 +451,41 @@@ class ContextGraph
return result
def get_node_property(self, node_id: str, property_name: str) -> Any:
- node = self.nodes.get(node_id)
- if not node:
- return None
- return node.properties.get(property_name)
+ with self._lock:
+ node = self.nodes.get(node_id)
+ if not node:
+ return None
+ return node.properties.get(property_name)
def get_node_attributes(self, node_id: str) -> Dict[str, Any]:
- node = self.nodes.get(node_id)
- if not node:
- return {}
- return node.properties.copy()
+ with self._lock:
+ node = self.nodes.get(node_id)
+ if not node:
+ return {}
+ return node.properties.copy()
def add_node_attribute(self, node_id: str, attributes: Dict[str, Any]) -> None:
- node = self.nodes.get(node_id)
- if not node:
- return
- node.properties.update(attributes)
- node.metadata.update(attributes)
+ with self._lock:
+ node = self.nodes.get(node_id)
+ if not node:
+ return
+ node.properties.update(attributes)
+ node.metadata.update(attributes)
+
+ if getattr(self, "mutation_callback", None) and not getattr(
+ self, "_suspend_mutation_callback", False
+ ):
+ self.mutation_callback("UPDATE_NODE", node_id, node.to_dict())
+
def get_edge_data(self, source_id: str, target_id: str) -> Dict[str, Any]:
- for edge in self._adjacency.get(source_id, []):
- if edge.target_id == target_id:
- data = edge.metadata.copy()
- data["type"] = edge.edge_type
- data["weight"] = edge.weight
- return data
+ with self._lock:
+ for edge in self._adjacency.get(source_id, []):
+ if edge.target_id == target_id:
+ data = edge.metadata.copy()
+ data["type"] = edge.edge_type
+ data["weight"] = edge.weight
+ return data
return {}
def get_neighbors(
@@@ -942,29 -989,13 +998,25 @@@
def density(self) -> float:
"""Calculate graph density."""
- n = len(self.nodes)
- if n < 2:
- return 0.0
- max_edges = n * (n - 1) # Directed graph
- return len(self.edges) / max_edges
-
+ with self._lock:
+ n = len(self.nodes)
+ if n < 2:
+ return 0.0
+ max_edges = n * (n - 1)
+ return len(self.edges) / max_edges
+
+ def clear(self) -> None:
- """
- Fully reset the graph state, clearing all nodes, edges, and internal indexes.
- """
- self.nodes.clear()
- self.edges.clear()
-
-
- if hasattr(self, '_adjacency'):
++ """Fully reset the graph state and indexes."""
++ with self._lock:
++ self.nodes.clear()
++ self.edges.clear()
+ self._adjacency.clear()
- if hasattr(self, 'node_type_index'):
+ self.node_type_index.clear()
- if hasattr(self, 'edge_type_index'):
+ self.edge_type_index.clear()
-
++ self._linked_graphs.clear()
++ self._unresolved_links.clear()
+ self.logger.debug("Graph state fully cleared.")
+
# --- Internal Helpers ---
def _normalize_timestamp(self, timestamp_value) -> datetime:
@@@ -1003,49 -1034,33 +1055,54 @@@
def _add_internal_node(self, node: ContextNode) -> bool:
"""Internal method to add a node."""
- self.nodes[node.node_id] = node
-
- if hasattr(node, 'node_type') and isinstance(node.node_type, str):
- self.node_type_index[node.node_type].add(node.node_id)
- else:
- self.node_type_index['unknown'].add(node.node_id)
+ with self._lock:
+ self.nodes[node.node_id] = node
+ # Handle edge case where node_type might be None or not a string
+ if hasattr(node, 'node_type') and isinstance(node.node_type, str):
+ self.node_type_index[node.node_type].add(node.node_id)
+ else:
+ # Use 'unknown' as fallback for invalid node_type
+ self.node_type_index['unknown'].add(node.node_id)
- return True
+ if getattr(self, "mutation_callback", None) and not getattr(
+ self, "_suspend_mutation_callback", False
+ ):
+ try:
+ self.mutation_callback("ADD_NODE", node.node_id, node.to_dict())
+ except Exception as e:
+ self.logger.warning(f"Audit trail callback failed for node {node.node_id}: {e}")
+ return True
+
def _add_internal_edge(self, edge: ContextEdge) -> bool:
"""Internal method to add an edge."""
+ with self._lock:
+ # Ensure nodes exist
+ if edge.source_id not in self.nodes:
+ self._add_internal_node(
+ ContextNode(edge.source_id, "entity", edge.source_id)
+ )
+ if edge.target_id not in self.nodes:
+ self._add_internal_node(
+ ContextNode(edge.target_id, "entity", edge.target_id)
+ )
- if edge.source_id not in self.nodes:
- self._add_internal_node(
- ContextNode(edge.source_id, "entity", edge.source_id)
- )
- if edge.target_id not in self.nodes:
- self._add_internal_node(
- ContextNode(edge.target_id, "entity", edge.target_id)
- )
-
- self.edges.append(edge)
- self.edge_type_index[edge.edge_type].append(edge)
- self._adjacency[edge.source_id].append(edge)
+ self.edges.append(edge)
+ self.edge_type_index[edge.edge_type].append(edge)
+ self._adjacency[edge.source_id].append(edge)
- return True
+
+ if getattr(self, "mutation_callback", None) and not getattr(
+ self, "_suspend_mutation_callback", False
+ ):
+ import json
++
+ edge_id = json.dumps([edge.source_id, edge.edge_type, edge.target_id])
+ try:
+ self.mutation_callback("ADD_EDGE", edge_id, edge.to_dict())
+ except Exception as e:
- self.logger.warning(f"Audit trail callback failed for edge {edge_id}: {e}")
-
++ self.logger.warning(
++ f"Audit trail callback failed for edge {edge_id}: {e}"
++ )
+ return True
# --- Builder Methods (Legacy/Utility) ---
diff --cc tests/change_management/test_managers.py
index 984883b2,4d29015d..36bd30f6
--- a/tests/change_management/test_managers.py
+++ b/tests/change_management/test_managers.py
@@@ -210,52 -268,61 +268,106 @@@ class TestTemporalVersionManager
assert diff["entities_modified"][0]["id"] == "entity1"
assert diff["entities_modified"][0]["changes"]["name"]["from"] == "Entity 1"
assert diff["entities_modified"][0]["changes"]["name"]["to"] == "Entity 1 Updated"
+ assert diff["summary"]["nodes_added"] == 1
+ assert diff["summary"]["edges_added"] == 1
+
+ def test_create_snapshot_accepts_nodes_and_edges(self):
+ """Test ContextGraph-style node/edge payload support."""
+ manager = TemporalVersionManager()
+ graph = {
+ "nodes": [
+ {"id": "entity1", "name": "Entity 1", "type": "Person"},
+ {"id": "entity2", "name": "Entity 2", "type": "Organization"},
+ ],
+ "edges": [
+ {"source": "entity1", "target": "entity2", "type": "works_for"}
+ ],
+ }
+
+ snapshot = manager.create_snapshot(
+ graph, "nodes_v1", "[email protected]", "Node/edge snapshot"
+ )
+
+ assert len(snapshot["nodes"]) == 2
+ assert len(snapshot["edges"]) == 1
+ assert len(snapshot["entities"]) == 2
+ assert len(snapshot["relationships"]) == 1
+
+ def test_compare_versions_supports_mixed_snapshot_schemas(self):
+ """Test diff compatibility between legacy and node/edge snapshots."""
+ manager = TemporalVersionManager()
+ manager.create_snapshot(
+ {"entities": [{"id": "entity1"}], "relationships": []},
+ "v1.0",
+ "Version 1",
+ )
+ manager.create_snapshot(
+ {"nodes": [{"id": "entity1"}, {"id": "entity2"}], "edges": []},
+ "v2.0",
+ "Version 2",
+ )
+
+ diff = manager.compare_versions("v1.0", "v2.0")
+ assert diff["summary"]["entities_added"] == 1
+ assert diff["summary"]["nodes_added"] == 1
+ assert diff["entities_added"][0]["id"] == "entity2"
+ def test_compare_versions_with_nodes_and_edges(self):
+ """Test detailed comparison for ContextGraph-style snapshots."""
+ manager = TemporalVersionManager()
+ graph_v1 = {
+ "nodes": [
+ {"id": "entity1", "name": "Entity 1", "type": "Person"},
+ {"id": "entity2", "name": "Entity 2", "type": "Organization"},
+ ],
+ "edges": [
+ {"source": "entity1", "target": "entity2", "type": "works_for"}
+ ],
+ }
+ graph_v2 = {
+ "nodes": [
+ {"id": "entity1", "name": "Entity 1 Updated", "type": "Person"},
+ {"id": "entity3", "name": "Entity 3", "type": "Project"},
+ ],
+ "edges": [
+ {"source": "entity1", "target": "entity3", "type": "manages"}
+ ],
+ }
+
+ manager.create_snapshot(graph_v1, "v1.0", "[email protected]", "Version 1")
+ manager.create_snapshot(graph_v2, "v2.0", "[email protected]", "Version 2")
+
+ diff = manager.compare_versions("v1.0", "v2.0")
+ assert diff["summary"]["entities_added"] == 1
+ assert diff["summary"]["entities_removed"] == 1
+ assert diff["summary"]["entities_modified"] == 1
+ assert diff["summary"]["relationships_added"] == 1
+ assert diff["summary"]["relationships_removed"] == 1
+
+ def test_compare_versions_with_mixed_snapshot_schemas(self):
+ """Test diff compatibility between legacy and node/edge snapshots."""
+ manager = TemporalVersionManager()
+ graph_v1 = {
+ "entities": [{"id": "entity1", "name": "Entity 1", "type": "Person"}],
+ "relationships": [],
+ }
+ graph_v2 = {
+ "nodes": [
+ {"id": "entity1", "name": "Entity 1", "type": "Person"},
+ {"id": "entity2", "name": "Entity 2", "type": "Organization"},
+ ],
+ "edges": [],
+ }
+
+ manager.create_snapshot(graph_v1, "v1.0", "[email protected]", "Version 1")
+ manager.create_snapshot(graph_v2, "v2.0", "[email protected]", "Version 2")
+
+ diff = manager.compare_versions("v1.0", "v2.0")
+ assert diff["summary"]["entities_added"] == 1
+ assert diff["entities_added"][0]["id"] == "entity2"
+
class TestOntologyVersionManager:
"""Test cases for OntologyVersionManager."""