Merge 2.0 to master (#651)

tests/unit/test_query/test_triples_neo4j_query.py

@@ -6,7 +6,7 @@ import pytest
 from unittest.mock import MagicMock, patch
 
 from trustgraph.query.triples.neo4j.service import Processor
-from trustgraph.schema import Value, TriplesQueryRequest
+from trustgraph.schema import Term, TriplesQueryRequest, IRI, LITERAL
 
 
 class TestNeo4jQueryProcessor:
@@ -25,50 +25,50 @@ class TestNeo4jQueryProcessor:
     def test_create_value_with_http_uri(self, processor):
         """Test create_value with HTTP URI"""
         result = processor.create_value("http://example.com/resource")
-        
-        assert isinstance(result, Value)
-        assert result.value == "http://example.com/resource"
-        assert result.is_uri is True
+
+        assert isinstance(result, Term)
+        assert result.iri == "http://example.com/resource"
+        assert result.type == IRI
 
     def test_create_value_with_https_uri(self, processor):
         """Test create_value with HTTPS URI"""
         result = processor.create_value("https://example.com/resource")
-        
-        assert isinstance(result, Value)
-        assert result.value == "https://example.com/resource"
-        assert result.is_uri is True
+
+        assert isinstance(result, Term)
+        assert result.iri == "https://example.com/resource"
+        assert result.type == IRI
 
     def test_create_value_with_literal(self, processor):
         """Test create_value with literal value"""
         result = processor.create_value("just a literal string")
-        
-        assert isinstance(result, Value)
+
+        assert isinstance(result, Term)
         assert result.value == "just a literal string"
-        assert result.is_uri is False
+        assert result.type == LITERAL
 
     def test_create_value_with_empty_string(self, processor):
         """Test create_value with empty string"""
         result = processor.create_value("")
-        
-        assert isinstance(result, Value)
+
+        assert isinstance(result, Term)
         assert result.value == ""
-        assert result.is_uri is False
+        assert result.type == LITERAL
 
     def test_create_value_with_partial_uri(self, processor):
         """Test create_value with string that looks like URI but isn't complete"""
         result = processor.create_value("http")
-        
-        assert isinstance(result, Value)
+
+        assert isinstance(result, Term)
         assert result.value == "http"
-        assert result.is_uri is False
+        assert result.type == LITERAL
 
     def test_create_value_with_ftp_uri(self, processor):
         """Test create_value with FTP URI (should not be detected as URI)"""
         result = processor.create_value("ftp://example.com/file")
-        
-        assert isinstance(result, Value)
+
+        assert isinstance(result, Term)
         assert result.value == "ftp://example.com/file"
-        assert result.is_uri is False
+        assert result.type == LITERAL
 
     @patch('trustgraph.query.triples.neo4j.service.GraphDatabase')
     def test_processor_initialization_with_defaults(self, mock_graph_db):
@@ -124,9 +124,9 @@ class TestNeo4jQueryProcessor:
         query = TriplesQueryRequest(
             user='test_user',
             collection='test_collection',
-            s=Value(value="http://example.com/subject", is_uri=True),
-            p=Value(value="http://example.com/predicate", is_uri=True),
-            o=Value(value="literal object", is_uri=False),
+            s=Term(type=IRI, iri="http://example.com/subject"),
+            p=Term(type=IRI, iri="http://example.com/predicate"),
+            o=Term(type=LITERAL, value="literal object"),
             limit=100
         )
         
@@ -137,8 +137,8 @@ class TestNeo4jQueryProcessor:
         
         # Verify result contains the queried triple (appears twice - once from each query)
         assert len(result) == 2
-        assert result[0].s.value == "http://example.com/subject"
-        assert result[0].p.value == "http://example.com/predicate"
+        assert result[0].s.iri == "http://example.com/subject"
+        assert result[0].p.iri == "http://example.com/predicate"
         assert result[0].o.value == "literal object"
 
     @patch('trustgraph.query.triples.neo4j.service.GraphDatabase')
@@ -166,8 +166,8 @@ class TestNeo4jQueryProcessor:
         query = TriplesQueryRequest(
             user='test_user',
             collection='test_collection',
-            s=Value(value="http://example.com/subject", is_uri=True),
-            p=Value(value="http://example.com/predicate", is_uri=True),
+            s=Term(type=IRI, iri="http://example.com/subject"),
+            p=Term(type=IRI, iri="http://example.com/predicate"),
             o=None,
             limit=100
         )
@@ -179,13 +179,13 @@ class TestNeo4jQueryProcessor:
         
         # Verify results contain different objects
         assert len(result) == 2
-        assert result[0].s.value == "http://example.com/subject"
-        assert result[0].p.value == "http://example.com/predicate"
+        assert result[0].s.iri == "http://example.com/subject"
+        assert result[0].p.iri == "http://example.com/predicate"
         assert result[0].o.value == "literal result"
-        
-        assert result[1].s.value == "http://example.com/subject"
-        assert result[1].p.value == "http://example.com/predicate"
-        assert result[1].o.value == "http://example.com/uri_result"
+
+        assert result[1].s.iri == "http://example.com/subject"
+        assert result[1].p.iri == "http://example.com/predicate"
+        assert result[1].o.iri == "http://example.com/uri_result"
 
     @patch('trustgraph.query.triples.neo4j.service.GraphDatabase')
     @pytest.mark.asyncio
@@ -225,13 +225,13 @@ class TestNeo4jQueryProcessor:
         
         # Verify results contain different triples
         assert len(result) == 2
-        assert result[0].s.value == "http://example.com/s1"
-        assert result[0].p.value == "http://example.com/p1"
+        assert result[0].s.iri == "http://example.com/s1"
+        assert result[0].p.iri == "http://example.com/p1"
         assert result[0].o.value == "literal1"
-        
-        assert result[1].s.value == "http://example.com/s2"
-        assert result[1].p.value == "http://example.com/p2"
-        assert result[1].o.value == "http://example.com/o2"
+
+        assert result[1].s.iri == "http://example.com/s2"
+        assert result[1].p.iri == "http://example.com/p2"
+        assert result[1].o.iri == "http://example.com/o2"
 
     @patch('trustgraph.query.triples.neo4j.service.GraphDatabase')
     @pytest.mark.asyncio
@@ -250,12 +250,12 @@ class TestNeo4jQueryProcessor:
         query = TriplesQueryRequest(
             user='test_user',
             collection='test_collection',
-            s=Value(value="http://example.com/subject", is_uri=True),
+            s=Term(type=IRI, iri="http://example.com/subject"),
             p=None,
             o=None,
             limit=100
         )
-        
+
         # Should raise the exception
         with pytest.raises(Exception, match="Database connection failed"):
             await processor.query_triples(query)