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(extraction): read schema declarations from every graph

Rudy Celekli0f2db83d74f3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d864085..c1011753 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,10 @@ All notable changes to Open Ontologies are documented here.
### Fixed
+- Read extraction-scaffold class metadata and property declarations from every
+ loaded graph, so TriG and N-Quads schemas retain the same typed extraction
+ checks and prompt fields as Turtle schemas.
+
- **The embedding model is loaded once per process rather than once per HTTP
session** (#262). The HTTP arm hands the same server constructor to
`StreamableHttpService::new` as a per-session factory, so everything that
diff --git a/src/extract_scaffold.rs b/src/extract_scaffold.rs
index cb93e96d..b49513a1 100644
--- a/src/extract_scaffold.rs
+++ b/src/extract_scaffold.rs
@@ -53,7 +53,7 @@ pub fn build_scaffold(graph: &Arc<GraphStore>, class_iri: &str) -> anyhow::Resul
class_iri
);
let mut props: Vec<PropertySpec> = Vec::new();
- if let Ok(js) = graph.sparql_select(&q)
+ if let Ok(js) = graph.sparql_select_union(&q)
&& let Ok(v) = serde_json::from_str::<serde_json::Value>(&js)
&& let Some(rows) = v["results"].as_array()
{
@@ -376,7 +376,7 @@ fn type_mismatch_kind(kind: RangeKind) -> String {
fn single_str(graph: &Arc<GraphStore>, iri: &str, pred: &str) -> Option<String> {
let q = format!("SELECT ?v WHERE {{ <{}> <{}> ?v }} LIMIT 1", iri, pred);
- let js = graph.sparql_select(&q).ok()?;
+ let js = graph.sparql_select_union(&q).ok()?;
let v: serde_json::Value = serde_json::from_str(&js).ok()?;
v["results"][0]["v"]
.as_str()
diff --git a/tests/extraction_named_graph_test.rs b/tests/extraction_named_graph_test.rs
new file mode 100644
index 00000000..144d3698
--- /dev/null
+++ b/tests/extraction_named_graph_test.rs
@@ -0,0 +1,92 @@
+use std::sync::Arc;
+
+use open_ontologies::extract_scaffold::{ExtractionScaffold, build_scaffold, validate_extraction};
+use open_ontologies::graph::GraphStore;
+use oxigraph::io::RdfFormat;
+
+const CLASS: &str = "https://example.org/Order";
+const ONTOLOGY: &str = r#"
+@prefix ex: <https://example.org/> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+ex:Order a owl:Class; rdfs:label "Order"; rdfs:comment "A customer order" .
+ex:quantity a owl:DatatypeProperty; rdfs:domain ex:Order; rdfs:range xsd:integer; rdfs:label "quantity" .
+"#;
+
+fn graph(content: &str, format: RdfFormat) -> Arc<GraphStore> {
+ let graph = Arc::new(GraphStore::new());
+ assert_eq!(graph.load_content(content, format).unwrap(), 7);
+ graph
+}
+
+fn assert_typed_schema(scaffold: &ExtractionScaffold) {
+ assert_eq!(scaffold.class_label.as_deref(), Some("Order"));
+ assert_eq!(scaffold.class_comment.as_deref(), Some("A customer order"));
+ assert_eq!(scaffold.property_schema.len(), 1);
+ assert_eq!(
+ scaffold.property_schema[0].property_iri,
+ "https://example.org/quantity"
+ );
+ assert_eq!(
+ scaffold.property_schema[0].property_label.as_deref(),
+ Some("quantity")
+ );
+ assert_eq!(
+ scaffold.property_schema[0].range,
+ "http://www.w3.org/2001/XMLSchema#integer"
+ );
+ let valid = validate_extraction(scaffold, r#"[{"quantity":"3"}]"#).unwrap();
+ assert_eq!(valid.valid, 1);
+ assert_eq!(valid.mean_conformance, 1.0);
+ let invalid = validate_extraction(scaffold, r#"[{"quantity":"three"}]"#).unwrap();
+ assert_eq!(invalid.valid, 0);
+ assert!(
+ invalid
+ .issues
+ .iter()
+ .any(|issue| issue.kind == "type_mismatch")
+ );
+}
+
+#[test]
+fn turtle_trig_and_nquads_keep_the_same_nonempty_extraction_schema() {
+ let turtle = graph(ONTOLOGY, RdfFormat::Turtle);
+ let expected = build_scaffold(&turtle, CLASS).unwrap();
+ assert_typed_schema(&expected);
+ let (prefixes, body) = ONTOLOGY.split_once("ex:Order").unwrap();
+ let trig = format!("{prefixes}<https://example.org/schema> {{ ex:Order{body} }}");
+ let named = graph(&trig, RdfFormat::TriG);
+ let nquads = named.serialize("nquads").unwrap();
+ let copied = graph(&nquads, RdfFormat::NQuads);
+ for dataset in [named, copied] {
+ let actual = build_scaffold(&dataset, CLASS).unwrap();
+ assert_typed_schema(&actual);
+ assert_eq!(
+ serde_json::to_value(actual).unwrap(),
+ serde_json::to_value(&expected).unwrap()
+ );
+ let user_query: serde_json::Value = serde_json::from_str(
+ &dataset.sparql_select("SELECT ?p WHERE { ?p <http://www.w3.org/2000/01/rdf-schema#domain> <https://example.org/Order> }").unwrap(),
+ ).unwrap();
+ assert!(
+ user_query["results"].as_array().unwrap().is_empty(),
+ "user SELECT keeps its chosen dataset"
+ );
+ }
+}
+
+#[test]
+fn class_metadata_and_property_declarations_can_be_in_different_graphs() {
+ let trig = r#"
+@prefix ex: <https://example.org/> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+ex:metadata { ex:Order a owl:Class; rdfs:label "Order"; rdfs:comment "A customer order" . }
+ex:domain { ex:quantity a owl:DatatypeProperty; rdfs:domain ex:Order . }
+ex:range { ex:quantity rdfs:range xsd:integer; rdfs:label "quantity" . }
+"#;
+ let dataset = graph(trig, RdfFormat::TriG);
+ assert_typed_schema(&build_scaffold(&dataset, CLASS).unwrap());
+}