From 16e66d0150725b5d123bfa7bf1f6fc3d565b145e Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Mon, 26 Jan 2026 22:54:50 +0000 Subject: [PATCH] Following the schema change, Value -> Term --- .../base/graph_embeddings_client.py | 12 +++++++--- .../trustgraph/base/triples_client.py | 22 ++++++++++++++----- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/trustgraph-base/trustgraph/base/graph_embeddings_client.py b/trustgraph-base/trustgraph/base/graph_embeddings_client.py index e25d76c7..07eb2bc7 100644 --- a/trustgraph-base/trustgraph/base/graph_embeddings_client.py +++ b/trustgraph-base/trustgraph/base/graph_embeddings_client.py @@ -2,15 +2,21 @@ import logging from . request_response_spec import RequestResponse, RequestResponseSpec -from .. schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse +from .. schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse, IRI, LITERAL from .. knowledge import Uri, Literal # Module logger logger = logging.getLogger(__name__) + def to_value(x): - if x.is_uri: return Uri(x.value) - return Literal(x.value) + """Convert schema Term to Uri or Literal.""" + if x.type == IRI: + return Uri(x.iri) + elif x.type == LITERAL: + return Literal(x.value) + # Fallback + return Literal(x.value or x.iri) class GraphEmbeddingsClient(RequestResponse): async def query(self, vectors, limit=20, user="trustgraph", diff --git a/trustgraph-base/trustgraph/base/triples_client.py b/trustgraph-base/trustgraph/base/triples_client.py index c9f747b5..7258d3ca 100644 --- a/trustgraph-base/trustgraph/base/triples_client.py +++ b/trustgraph-base/trustgraph/base/triples_client.py @@ -1,24 +1,34 @@ from . request_response_spec import RequestResponse, RequestResponseSpec -from .. schema import TriplesQueryRequest, TriplesQueryResponse, Value +from .. schema import TriplesQueryRequest, TriplesQueryResponse, Term, IRI, LITERAL from .. knowledge import Uri, Literal + class Triple: def __init__(self, s, p, o): self.s = s self.p = p self.o = o + def to_value(x): - if x.is_uri: return Uri(x.value) - return Literal(x.value) + """Convert schema Term to Uri or Literal.""" + if x.type == IRI: + return Uri(x.iri) + elif x.type == LITERAL: + return Literal(x.value) + # Fallback + return Literal(x.value or x.iri) + def from_value(x): - if x is None: return None + """Convert Uri or Literal to schema Term.""" + if x is None: + return None if isinstance(x, Uri): - return Value(value=str(x), is_uri=True) + return Term(type=IRI, iri=str(x)) else: - return Value(value=str(x), is_uri=False) + return Term(type=LITERAL, value=str(x)) class TriplesClient(RequestResponse): async def query(self, s=None, p=None, o=None, limit=20,