fix: always extract fulliri in nt, add non-ascii test

Author: VanyaGlazunov

AGENTS.md

@@ -27,7 +27,7 @@ pathrex/
 │   └── formats/
 │       ├── mod.rs              # FormatError enum, re-exports
 │       ├── csv.rs              # Csv<R> — CSV → Edge iterator (CsvConfig, ColumnSpec)
-│       └── nt.rs               # NTriples<R> — N-Triples → Edge iterator (LabelExtraction)
+│       └── nt.rs               # NTriples<R> — N-Triples → Edge iterator
 ├── tests/
 │   └── inmemory_tests.rs       # Integration tests for InMemoryBuilder / InMemoryGraph
 ├── deps/
@@ -211,24 +211,18 @@ Name-based lookup requires `has_header: true`.
 
 #### `NTriples<R>`
 
-[`NTriples<R>`](src/formats/nt.rs:57) parses [W3C N-Triples](https://www.w3.org/TR/n-triples/)
+[`NTriples<R>`](src/formats/nt.rs:51) parses [W3C N-Triples](https://www.w3.org/TR/n-triples/)
 RDF files using `oxttl`. Each triple `(subject, predicate, object)` becomes an
 [`Edge`](src/graph/mod.rs:154) where:
 
 - `source` — subject IRI or blank-node ID (`_:label`).
 - `target` — object IRI or blank-node ID; triples whose object is an RDF
   literal yield `Err(FormatError::LiteralAsNode)` (callers may filter these out).
-- `label` — predicate IRI, transformed by [`LabelExtraction`](src/formats/nt.rs:36):
+- `label` — full predicate IRI string.
 
-| Variant | Behaviour |
-|---|---|
-| `LocalName` (default) | Fragment (`#name`) or last path segment of the predicate IRI |
-| `FullIri` | Full predicate IRI string |
-
-Constructors:
+Constructor:
 
-- [`NTriples::new(reader)`](src/formats/nt.rs:72) — uses `LabelExtraction::LocalName`.
-- [`NTriples::with_label_extraction(reader, strategy)`](src/formats/nt.rs:76) — explicit strategy.
+- [`NTriples::new(reader)`](src/formats/nt.rs:56) — parses the stream; each predicate becomes the edge label verbatim.
 
 ### FFI layer
 

src/formats/csv.rs

@@ -230,6 +230,25 @@ mod tests {
         assert!(edges.is_empty());
     }
 
+    #[test]
+    fn test_non_ascii() {
+        let csv = "source,target,label\n\
+人甲,人乙,认识\n\
+Алиса,Боб,знает\n";
+        let edges: Vec<_> = make_csv(csv).collect();
+        assert_eq!(edges.len(), 2);
+
+        let e0 = edges[0].as_ref().unwrap();
+        assert_eq!(e0.source, "人甲");
+        assert_eq!(e0.target, "人乙");
+        assert_eq!(e0.label, "认识");
+
+        let e1 = edges[1].as_ref().unwrap();
+        assert_eq!(e1.source, "Алиса");
+        assert_eq!(e1.target, "Боб");
+        assert_eq!(e1.label, "знает");
+    }
+
     #[test]
     fn test_graph_source_impl() {
         use crate::graph::{GraphBuilder, GraphDecomposition, InMemoryBuilder};

src/formats/mod.rs

@@ -47,6 +47,6 @@ pub enum FormatError {
 
     /// An RDF literal appeared as a subject or object where a node IRI or
     /// blank node was expected.
-    #[error("RDF literal cannot be used as a graph node (triple skipped)")]
+    #[error("RDF literal cannot be used as a graph node")]
     LiteralAsNode,
 }

src/formats/nt.rs

@@ -33,19 +33,6 @@ use oxttl::ntriples::ReaderNTriplesParser;
 use crate::formats::FormatError;
 use crate::graph::Edge;
 
-/// Controls how predicate IRIs are converted to edge label strings.
-#[derive(Debug, Clone, Default)]
-pub enum LabelExtraction {
-    /// Use only the local name: the fragment (`#name`) or last path segment.
-    /// For example, `http://example.org/ns/knows` → `"knows"`.
-    /// This is the default.
-    #[default]
-    LocalName,
-    /// Use the full IRI string as the label.
-    /// For example, `http://example.org/ns/knows` → `"http://example.org/ns/knows"`.
-    FullIri,
-}
-
 /// An iterator that reads N-Triples and yields `Result<Edge, FormatError>`.
 ///
 /// # Example
@@ -63,18 +50,12 @@ pub enum LabelExtraction {
 /// ```
 pub struct NTriples<R: Read> {
     inner: ReaderNTriplesParser<R>,
-    label_extraction: LabelExtraction,
 }
 
 impl<R: Read> NTriples<R> {
     pub fn new(reader: R) -> Self {
-        Self::with_label_extraction(reader, LabelExtraction::LocalName)
-    }
-
-    pub fn with_label_extraction(reader: R, label_extraction: LabelExtraction) -> Self {
         Self {
             inner: NTriplesParser::new().for_reader(reader),
-            label_extraction,
         }
     }
 
@@ -92,22 +73,6 @@ impl<R: Read> NTriples<R> {
             Term::Literal(_) => Err(FormatError::LiteralAsNode),
         }
     }
-
-    fn extract_label(iri: &str, strategy: &LabelExtraction) -> String {
-        match strategy {
-            LabelExtraction::FullIri => iri.to_owned(),
-            LabelExtraction::LocalName => {
-                // Fragment takes priority, then last path segment.
-                if let Some(pos) = iri.rfind('#') {
-                    iri[pos + 1..].to_owned()
-                } else if let Some(pos) = iri.rfind('/') {
-                    iri[pos + 1..].to_owned()
-                } else {
-                    iri.to_owned()
-                }
-            }
-        }
-    }
 }
 
 impl<R: Read> Iterator for NTriples<R> {
@@ -120,7 +85,7 @@ impl<R: Read> Iterator for NTriples<R> {
         };
 
         let source = Self::subject_to_node_id(triple.subject.into());
-        let label = Self::extract_label(triple.predicate.as_str(), &self.label_extraction);
+        let label = triple.predicate.as_str().to_owned();
         let target = match Self::object_to_node_id(triple.object) {
             Ok(t) => t,
             Err(e) => return Some(Err(e)),
@@ -152,23 +117,12 @@ mod tests {
         let e0 = edges[0].as_ref().unwrap();
         assert_eq!(e0.source, "http://example.org/Alice");
         assert_eq!(e0.target, "http://example.org/Bob");
-        assert_eq!(e0.label, "knows");
+        assert_eq!(e0.label, "http://example.org/knows");
 
         let e1 = edges[1].as_ref().unwrap();
         assert_eq!(e1.source, "http://example.org/Bob");
         assert_eq!(e1.target, "http://example.org/Charlie");
-        assert_eq!(e1.label, "likes");
-    }
-
-    #[test]
-    fn test_full_iri_label_extraction() {
-        let nt =
-            "<http://example.org/Alice> <http://example.org/knows> <http://example.org/Bob> .\n";
-        let edges: Vec<_> =
-            NTriples::with_label_extraction(nt.as_bytes(), LabelExtraction::FullIri).collect();
-
-        assert_eq!(edges.len(), 1);
-        assert_eq!(edges[0].as_ref().unwrap().label, "http://example.org/knows");
+        assert_eq!(e1.label, "http://example.org/likes");
     }
 
     #[test]
@@ -210,11 +164,32 @@ mod tests {
     }
 
     #[test]
-    fn test_fragment_iri_local_name() {
+    fn test_predicate_with_fragment_is_full_iri_string() {
         let nt =
             "<http://example.org/Alice> <http://example.org/ns#knows> <http://example.org/Bob> .\n";
         let edges = parse(nt);
-        assert_eq!(edges[0].as_ref().unwrap().label, "knows");
+        assert_eq!(
+            edges[0].as_ref().unwrap().label,
+            "http://example.org/ns#knows"
+        );
+    }
+
+    #[test]
+    fn test_non_ascii_in_iris() {
+        let nt = "<http://example.org/人甲> <http://example.org/关系/认识> <http://example.org/人乙> .\n\
+                  <http://example.org/Алиса> <http://example.org/знает> <http://example.org/Боб> .\n";
+        let edges = parse(nt);
+        assert_eq!(edges.len(), 2);
+
+        let e0 = edges[0].as_ref().unwrap();
+        assert_eq!(e0.source, "http://example.org/人甲");
+        assert_eq!(e0.target, "http://example.org/人乙");
+        assert_eq!(e0.label, "http://example.org/关系/认识");
+
+        let e1 = edges[1].as_ref().unwrap();
+        assert_eq!(e1.source, "http://example.org/Алиса");
+        assert_eq!(e1.target, "http://example.org/Боб");
+        assert_eq!(e1.label, "http://example.org/знает");
     }
 
     #[test]

src/graph/inmemory.rs

@@ -303,7 +303,7 @@ mod tests {
             .expect("build should succeed");
 
         assert_eq!(graph.num_nodes(), 3);
-        assert!(graph.get_graph("knows").is_ok());
-        assert!(graph.get_graph("likes").is_ok());
+        assert!(graph.get_graph("http://example.org/knows").is_ok());
+        assert!(graph.get_graph("http://example.org/likes").is_ok());
     }
 }