From 7c1c52b39fc1471eb7b3605703f5cf078b800aa0 Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Mon, 26 Jan 2026 23:01:54 +0000 Subject: [PATCH] Following the schema change, Value -> Term --- .../base/document_embeddings_query_service.py | 2 +- .../trustgraph/base/graph_embeddings_query_service.py | 2 +- .../trustgraph/base/triples_query_service.py | 2 +- .../trustgraph/clients/triples_query_client.py | 6 +++--- .../trustgraph/messaging/translators/__init__.py | 2 +- .../trustgraph/schema/knowledge/embeddings.py | 4 ++-- trustgraph-base/trustgraph/schema/knowledge/graph.py | 4 ++-- trustgraph-base/trustgraph/schema/services/lookup.py | 2 +- trustgraph-base/trustgraph/schema/services/query.py | 10 +++++----- .../trustgraph/schema/services/retrieval.py | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/trustgraph-base/trustgraph/base/document_embeddings_query_service.py b/trustgraph-base/trustgraph/base/document_embeddings_query_service.py index bca915e0..486ccd59 100644 --- a/trustgraph-base/trustgraph/base/document_embeddings_query_service.py +++ b/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 diff --git a/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py b/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py index f3afdba2..874b080d 100644 --- a/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py +++ b/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 diff --git a/trustgraph-base/trustgraph/base/triples_query_service.py b/trustgraph-base/trustgraph/base/triples_query_service.py index 0d8affcb..b156ef55 100644 --- a/trustgraph-base/trustgraph/base/triples_query_service.py +++ b/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 diff --git a/trustgraph-base/trustgraph/clients/triples_query_client.py b/trustgraph-base/trustgraph/clients/triples_query_client.py index 8ed2ebb7..401aaf0b 100644 --- a/trustgraph-base/trustgraph/clients/triples_query_client.py +++ b/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, diff --git a/trustgraph-base/trustgraph/messaging/translators/__init__.py b/trustgraph-base/trustgraph/messaging/translators/__init__.py index 9ce2730e..5849f4ce 100644 --- a/trustgraph-base/trustgraph/messaging/translators/__init__.py +++ b/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 diff --git a/trustgraph-base/trustgraph/schema/knowledge/embeddings.py b/trustgraph-base/trustgraph/schema/knowledge/embeddings.py index a3e5b394..473ec3a4 100644 --- a/trustgraph-base/trustgraph/schema/knowledge/embeddings.py +++ b/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 diff --git a/trustgraph-base/trustgraph/schema/knowledge/graph.py b/trustgraph-base/trustgraph/schema/knowledge/graph.py index 9040c25e..4ee8d2c0 100644 --- a/trustgraph-base/trustgraph/schema/knowledge/graph.py +++ b/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 diff --git a/trustgraph-base/trustgraph/schema/services/lookup.py b/trustgraph-base/trustgraph/schema/services/lookup.py index bdeac636..d944fb89 100644 --- a/trustgraph-base/trustgraph/schema/services/lookup.py +++ b/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 diff --git a/trustgraph-base/trustgraph/schema/services/query.py b/trustgraph-base/trustgraph/schema/services/query.py index 31d0852d..991e8729 100644 --- a/trustgraph-base/trustgraph/schema/services/query.py +++ b/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 diff --git a/trustgraph-base/trustgraph/schema/services/retrieval.py b/trustgraph-base/trustgraph/schema/services/retrieval.py index 72085ae8..4337cb9b 100644 --- a/trustgraph-base/trustgraph/schema/services/retrieval.py +++ b/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 ############################################################################