Skip to content

Plan, apply and roll back changes to a production ontology, with a blast radius report and a proof an auditor can re-check.

fix: reuse parsed RDF terms for identical diff inputs

Rudy Celeklia3f7403b4ea6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6646495d..c570b6ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to Open Ontologies are documented here.
### Fixed
+- Python: keep anonymous blank-node identities stable when diffing identical RDF text in `OntologyEngine.diff` and `kgcl_diff`; identical inputs remain parsed and validated.
+
- Keep the last active ontology intact when parsing a replacement source, cache, or refresh fails; publish successful replacements in one graph transaction.
- Bound wildcard repository filtering to pattern/filename pairs so repeated stars cannot stall `onto_repo_list`.
- Sanitize quotes and ASCII control bytes in mapped IRI components so valid structured data does not fail RDF ingestion.
diff --git a/python/src/open_ontologies_lite/engine.py b/python/src/open_ontologies_lite/engine.py
index 2711e08e..d81bb6d1 100644
--- a/python/src/open_ontologies_lite/engine.py
+++ b/python/src/open_ontologies_lite/engine.py
@@ -176,7 +176,10 @@ class OntologyEngine:
"""Triple-level diff between two ontologies (added/removed vs A→B)."""
rdf_format = resolve_format(fmt)
a = {_triple_key(t) for t in ox.parse(data_a.encode("utf-8"), format=rdf_format)}
- b = {_triple_key(t) for t in ox.parse(data_b.encode("utf-8"), format=rdf_format)}
+ # Reuse parsed blank-node identities for the same input document.
+ b = a if data_a == data_b else {
+ _triple_key(t) for t in ox.parse(data_b.encode("utf-8"), format=rdf_format)
+ }
return {
"added": sorted(b - a),
"removed": sorted(a - b),
diff --git a/python/src/open_ontologies_lite/kgcl.py b/python/src/open_ontologies_lite/kgcl.py
index 611148eb..357c24ae 100644
--- a/python/src/open_ontologies_lite/kgcl.py
+++ b/python/src/open_ontologies_lite/kgcl.py
@@ -109,7 +109,8 @@ def kgcl_diff(old: str, new: str, fmt: str = "turtle") -> ChangeSet:
node_annotation_change, edge_creation, edge_deletion.
"""
old_t, old_s = _parse(old, fmt)
- new_t, new_s = _parse(new, fmt)
+ # Parsing identical text twice generates different anonymous blank-node IDs.
+ new_t, new_s = (old_t, old_s) if old == new else _parse(new, fmt)
cs = ChangeSet()
subjects = set(old_s) | set(new_s)
diff --git a/python/tests/test_identical_diff.py b/python/tests/test_identical_diff.py
new file mode 100644
index 00000000..fb842b39
--- /dev/null
+++ b/python/tests/test_identical_diff.py
@@ -0,0 +1,30 @@
+import pytest
+from open_ontologies_lite import OntologyEngine
+from open_ontologies_lite.kgcl import kgcl_diff
+
[email protected]('data,count', [
+ ('@prefix ex:<http://x/>. ex:S ex:p [ex:q "value"].',2),
+ ('@prefix ex:<http://x/>. ex:S ex:p [ex:q [ex:r "value"]].',3),
+ ('@prefix ex:<http://x/>. ex:S ex:p ("a" "b").',5),
+ ('@prefix ex:<http://x/>. ex:S ex:p _:b. _:b ex:q "value".',2),
+ ('@prefix ex:<http://x/>. ex:S ex:p "value". ex:S ex:p "value".',1),
+])
[email protected]('api',['engine','kgcl'])
+def test_identical_document_has_no_changes(data,count,api):
+ if api == 'engine':
+ result=OntologyEngine.diff(data,data)
+ assert result == {'added':[], 'removed':[], 'added_count':0, 'removed_count':0, 'unchanged_count':count}
+ else:
+ assert kgcl_diff(data,data).changes == []
+
[email protected]('diff',[OntologyEngine.diff,kgcl_diff])
+def test_identical_invalid_document_still_rejected(diff):
+ with pytest.raises(SyntaxError): diff('not turtle','not turtle')
+
+def test_genuine_named_node_difference_control():
+ old='<http://x/S> <http://x/p> <http://x/A>.'
+ new='<http://x/S> <http://x/p> <http://x/B>.'
+ result=OntologyEngine.diff(old,new)
+ assert result['added_count']==result['removed_count']==1
+ assert result['unchanged_count']==0
+ assert kgcl_diff(old,new).counts() == {'edge_creation':1,'edge_deletion':1}