Following the schema change, Value -> Term

trustgraph-base/trustgraph/base/document_embeddings_query_service.py

@@ -7,7 +7,7 @@ embeddings.
 import logging
 
 from .. schema import DocumentEmbeddingsRequest, DocumentEmbeddingsResponse
-from .. schema import Error, Value
+from .. schema import Error, Term
 
 from . flow_processor import FlowProcessor
 from . consumer_spec import ConsumerSpec

trustgraph-base/trustgraph/base/graph_embeddings_query_service.py

@@ -7,7 +7,7 @@ embeddings.
 import logging
 
 from .. schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse
-from .. schema import Error, Value
+from .. schema import Error, Term
 
 from . flow_processor import FlowProcessor
 from . consumer_spec import ConsumerSpec

trustgraph-base/trustgraph/base/triples_query_service.py

@@ -7,7 +7,7 @@ null.  Output is a list of triples.
 import logging
 
 from .. schema import TriplesQueryRequest, TriplesQueryResponse, Error
-from .. schema import Value, Triple
+from .. schema import Term, Triple
 
 from . flow_processor import FlowProcessor
 from . consumer_spec import  ConsumerSpec

trustgraph-base/trustgraph/clients/triples_query_client.py

@@ -2,7 +2,7 @@
 
 import _pulsar
 
-from .. schema import TriplesQueryRequest, TriplesQueryResponse, Value
+from .. schema import TriplesQueryRequest, TriplesQueryResponse, Term, IRI, LITERAL
 from .. schema import triples_request_queue
 from .. schema import triples_response_queue
 from . base import BaseClient
@@ -46,9 +46,9 @@ class TriplesQueryClient(BaseClient):
         if ent == None: return None
 
         if ent.startswith("http://") or ent.startswith("https://"):
-            return Value(value=ent, is_uri=True)
+            return Term(type=IRI, iri=ent)
 
-        return Value(value=ent, is_uri=False)
+        return Term(type=LITERAL, value=ent)
 
     def request(
             self, 

trustgraph-base/trustgraph/messaging/translators/__init__.py

@@ -1,5 +1,5 @@
 from .base import Translator, MessageTranslator
-from .primitives import ValueTranslator, TripleTranslator, SubgraphTranslator, RowSchemaTranslator, FieldTranslator, row_schema_translator, field_translator
+from .primitives import TermTranslator, ValueTranslator, TripleTranslator, SubgraphTranslator, RowSchemaTranslator, FieldTranslator, row_schema_translator, field_translator
 from .metadata import DocumentMetadataTranslator, ProcessingMetadataTranslator
 from .agent import AgentRequestTranslator, AgentResponseTranslator
 from .embeddings import EmbeddingsRequestTranslator, EmbeddingsResponseTranslator

trustgraph-base/trustgraph/schema/knowledge/embeddings.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 
 from ..core.metadata import Metadata
-from ..core.primitives import Value, RowSchema
+from ..core.primitives import Term, RowSchema
 from ..core.topic import topic
 
 ############################################################################
@@ -10,7 +10,7 @@ from ..core.topic import topic
 
 @dataclass
 class EntityEmbeddings:
-    entity: Value | None = None
+    entity: Term | None = None
     vectors: list[list[float]] = field(default_factory=list)
 
 # This is a 'batching' mechanism for the above data

trustgraph-base/trustgraph/schema/knowledge/graph.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from ..core.primitives import Value, Triple
+from ..core.primitives import Term, Triple
 from ..core.metadata import Metadata
 from ..core.topic import topic
 
@@ -10,7 +10,7 @@ from ..core.topic import topic
 
 @dataclass
 class EntityContext:
-    entity: Value | None = None
+    entity: Term | None = None
     context: str = ""
 
 # This is a 'batching' mechanism for the above data

trustgraph-base/trustgraph/schema/services/lookup.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from ..core.primitives import Error, Value, Triple
+from ..core.primitives import Error, Term, Triple
 from ..core.topic import topic
 from ..core.metadata import Metadata
 

trustgraph-base/trustgraph/schema/services/query.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from ..core.primitives import Error, Value, Triple
+from ..core.primitives import Error, Term, Triple
 from ..core.topic import topic
 
 ############################################################################
@@ -17,7 +17,7 @@ class GraphEmbeddingsRequest:
 @dataclass
 class GraphEmbeddingsResponse:
     error: Error | None = None
-    entities: list[Value] = field(default_factory=list)
+    entities: list[Term] = field(default_factory=list)
 
 ############################################################################
 
@@ -27,9 +27,9 @@ class GraphEmbeddingsResponse:
 class TriplesQueryRequest:
     user: str = ""
     collection: str = ""
-    s: Value | None = None
-    p: Value | None = None
-    o: Value | None = None
+    s: Term | None = None
+    p: Term | None = None
+    o: Term | None = None
     limit: int = 0
 
 @dataclass

trustgraph-base/trustgraph/schema/services/retrieval.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from ..core.topic import topic
-from ..core.primitives import Error, Value
+from ..core.primitives import Error, Term
 
 ############################################################################