mirror of
https://github.com/trustgraph-ai/trustgraph.git
synced 2026-07-09 05:12:12 +02:00
Steaming triples
This commit is contained in:
parent
3c3e11bef5
commit
027ef9b85d
6 changed files with 226 additions and 54 deletions
|
|
@ -790,6 +790,73 @@ class SocketFlowInstance:
|
||||||
|
|
||||||
return self.client._send_request_sync("triples", self.flow_id, request, False)
|
return self.client._send_request_sync("triples", self.flow_id, request, False)
|
||||||
|
|
||||||
|
def triples_query_stream(
|
||||||
|
self,
|
||||||
|
s: Optional[str] = None,
|
||||||
|
p: Optional[str] = None,
|
||||||
|
o: Optional[str] = None,
|
||||||
|
user: Optional[str] = None,
|
||||||
|
collection: Optional[str] = None,
|
||||||
|
limit: int = 100,
|
||||||
|
batch_size: int = 20,
|
||||||
|
**kwargs: Any
|
||||||
|
) -> Iterator[List[Dict[str, Any]]]:
|
||||||
|
"""
|
||||||
|
Query knowledge graph triples with streaming batches.
|
||||||
|
|
||||||
|
Yields batches of triples as they arrive, reducing time-to-first-result
|
||||||
|
and memory overhead for large result sets.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
s: Subject URI (optional, use None for wildcard)
|
||||||
|
p: Predicate URI (optional, use None for wildcard)
|
||||||
|
o: Object URI or Literal (optional, use None for wildcard)
|
||||||
|
user: User/keyspace identifier (optional)
|
||||||
|
collection: Collection identifier (optional)
|
||||||
|
limit: Maximum results to return (default: 100)
|
||||||
|
batch_size: Triples per batch (default: 20)
|
||||||
|
**kwargs: Additional parameters passed to the service
|
||||||
|
|
||||||
|
Yields:
|
||||||
|
List[Dict]: Batches of triples in wire format
|
||||||
|
|
||||||
|
Example:
|
||||||
|
```python
|
||||||
|
socket = api.socket()
|
||||||
|
flow = socket.flow("default")
|
||||||
|
|
||||||
|
for batch in flow.triples_query_stream(
|
||||||
|
user="trustgraph",
|
||||||
|
collection="default"
|
||||||
|
):
|
||||||
|
for triple in batch:
|
||||||
|
print(triple["s"], triple["p"], triple["o"])
|
||||||
|
```
|
||||||
|
"""
|
||||||
|
request = {
|
||||||
|
"limit": limit,
|
||||||
|
"streaming": True,
|
||||||
|
"batch-size": batch_size,
|
||||||
|
}
|
||||||
|
if s is not None:
|
||||||
|
request["s"] = str(s)
|
||||||
|
if p is not None:
|
||||||
|
request["p"] = str(p)
|
||||||
|
if o is not None:
|
||||||
|
request["o"] = str(o)
|
||||||
|
if user is not None:
|
||||||
|
request["user"] = user
|
||||||
|
if collection is not None:
|
||||||
|
request["collection"] = collection
|
||||||
|
request.update(kwargs)
|
||||||
|
|
||||||
|
for chunk in self.client._send_request_sync("triples", self.flow_id, request, streaming=True):
|
||||||
|
# Each chunk is the raw response containing triples batch
|
||||||
|
if hasattr(chunk, 'response'):
|
||||||
|
yield chunk.response
|
||||||
|
elif isinstance(chunk, dict) and "response" in chunk:
|
||||||
|
yield chunk["response"]
|
||||||
|
|
||||||
def rows_query(
|
def rows_query(
|
||||||
self,
|
self,
|
||||||
query: str,
|
query: str,
|
||||||
|
|
|
||||||
|
|
@ -52,13 +52,23 @@ class TriplesQueryService(FlowProcessor):
|
||||||
|
|
||||||
logger.debug(f"Handling triples query request {id}...")
|
logger.debug(f"Handling triples query request {id}...")
|
||||||
|
|
||||||
triples = await self.query_triples(request)
|
if request.streaming:
|
||||||
|
# Streaming mode: send batches
|
||||||
logger.debug("Sending triples query response...")
|
async for batch, is_final in self.query_triples_stream(request):
|
||||||
r = TriplesQueryResponse(triples=triples, error=None)
|
r = TriplesQueryResponse(
|
||||||
await flow("response").send(r, properties={"id": id})
|
triples=batch,
|
||||||
|
error=None,
|
||||||
logger.debug("Triples query request completed")
|
is_final=is_final,
|
||||||
|
)
|
||||||
|
await flow("response").send(r, properties={"id": id})
|
||||||
|
logger.debug("Triples query streaming completed")
|
||||||
|
else:
|
||||||
|
# Non-streaming mode: single response
|
||||||
|
triples = await self.query_triples(request)
|
||||||
|
logger.debug("Sending triples query response...")
|
||||||
|
r = TriplesQueryResponse(triples=triples, error=None)
|
||||||
|
await flow("response").send(r, properties={"id": id})
|
||||||
|
logger.debug("Triples query request completed")
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
||||||
|
|
@ -76,6 +86,24 @@ class TriplesQueryService(FlowProcessor):
|
||||||
|
|
||||||
await flow("response").send(r, properties={"id": id})
|
await flow("response").send(r, properties={"id": id})
|
||||||
|
|
||||||
|
async def query_triples_stream(self, request):
|
||||||
|
"""
|
||||||
|
Streaming query - yields (batch, is_final) tuples.
|
||||||
|
Default implementation batches results from query_triples.
|
||||||
|
Override for true streaming from backend.
|
||||||
|
"""
|
||||||
|
triples = await self.query_triples(request)
|
||||||
|
batch_size = request.batch_size if request.batch_size > 0 else 20
|
||||||
|
|
||||||
|
for i in range(0, len(triples), batch_size):
|
||||||
|
batch = triples[i:i + batch_size]
|
||||||
|
is_final = (i + batch_size >= len(triples))
|
||||||
|
yield batch, is_final
|
||||||
|
|
||||||
|
# Handle empty result
|
||||||
|
if len(triples) == 0:
|
||||||
|
yield [], True
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def add_args(parser):
|
def add_args(parser):
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,14 +23,18 @@ class TriplesQueryRequestTranslator(MessageTranslator):
|
||||||
g=g,
|
g=g,
|
||||||
limit=int(data.get("limit", 10000)),
|
limit=int(data.get("limit", 10000)),
|
||||||
user=data.get("user", "trustgraph"),
|
user=data.get("user", "trustgraph"),
|
||||||
collection=data.get("collection", "default")
|
collection=data.get("collection", "default"),
|
||||||
|
streaming=data.get("streaming", False),
|
||||||
|
batch_size=int(data.get("batch-size", 20)),
|
||||||
)
|
)
|
||||||
|
|
||||||
def from_pulsar(self, obj: TriplesQueryRequest) -> Dict[str, Any]:
|
def from_pulsar(self, obj: TriplesQueryRequest) -> Dict[str, Any]:
|
||||||
result = {
|
result = {
|
||||||
"limit": obj.limit,
|
"limit": obj.limit,
|
||||||
"user": obj.user,
|
"user": obj.user,
|
||||||
"collection": obj.collection
|
"collection": obj.collection,
|
||||||
|
"streaming": obj.streaming,
|
||||||
|
"batch-size": obj.batch_size,
|
||||||
}
|
}
|
||||||
|
|
||||||
if obj.s:
|
if obj.s:
|
||||||
|
|
@ -61,4 +65,4 @@ class TriplesQueryResponseTranslator(MessageTranslator):
|
||||||
|
|
||||||
def from_response_with_completion(self, obj: TriplesQueryResponse) -> Tuple[Dict[str, Any], bool]:
|
def from_response_with_completion(self, obj: TriplesQueryResponse) -> Tuple[Dict[str, Any], bool]:
|
||||||
"""Returns (response_dict, is_final)"""
|
"""Returns (response_dict, is_final)"""
|
||||||
return self.from_pulsar(obj), True
|
return self.from_pulsar(obj), obj.is_final
|
||||||
|
|
@ -38,11 +38,14 @@ class TriplesQueryRequest:
|
||||||
o: Term | None = None
|
o: Term | None = None
|
||||||
g: str | None = None # Graph IRI. None=default graph, "*"=all graphs
|
g: str | None = None # Graph IRI. None=default graph, "*"=all graphs
|
||||||
limit: int = 0
|
limit: int = 0
|
||||||
|
streaming: bool = False # Enable streaming mode (multiple batched responses)
|
||||||
|
batch_size: int = 20 # Triples per batch in streaming mode
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class TriplesQueryResponse:
|
class TriplesQueryResponse:
|
||||||
error: Error | None = None
|
error: Error | None = None
|
||||||
triples: list[Triple] = field(default_factory=list)
|
triples: list[Triple] = field(default_factory=list)
|
||||||
|
is_final: bool = True # False for intermediate batches in streaming mode
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
"""
|
"""
|
||||||
Connects to the graph query service and dumps all graph edges in Turtle
|
Connects to the graph query service and dumps all graph edges in Turtle
|
||||||
format with RDF-star support for quoted triples.
|
format with RDF-star support for quoted triples.
|
||||||
|
Uses streaming mode for lower time-to-first-processing.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import rdflib
|
import rdflib
|
||||||
|
|
@ -9,66 +10,82 @@ import sys
|
||||||
import argparse
|
import argparse
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from trustgraph.api import Api, Uri
|
from trustgraph.api import Api
|
||||||
from trustgraph.knowledge import QuotedTriple
|
|
||||||
|
|
||||||
default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
|
default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
|
||||||
default_user = 'trustgraph'
|
default_user = 'trustgraph'
|
||||||
default_collection = 'default'
|
default_collection = 'default'
|
||||||
|
default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
|
||||||
|
|
||||||
|
|
||||||
def value_to_rdflib(val):
|
def term_to_rdflib(term):
|
||||||
"""Convert a TrustGraph value to an rdflib term."""
|
"""Convert a wire-format term to an rdflib term."""
|
||||||
if isinstance(val, Uri):
|
if term is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
t = term.get("t", "")
|
||||||
|
|
||||||
|
if t == "i": # IRI
|
||||||
|
iri = term.get("i", "")
|
||||||
# Skip malformed URLs with spaces
|
# Skip malformed URLs with spaces
|
||||||
if " " in val:
|
if " " in iri:
|
||||||
return None
|
return None
|
||||||
return rdflib.term.URIRef(val)
|
return rdflib.term.URIRef(iri)
|
||||||
elif isinstance(val, QuotedTriple):
|
elif t == "l": # Literal
|
||||||
# RDF-star quoted triple
|
value = term.get("v", "")
|
||||||
s_term = value_to_rdflib(val.s)
|
datatype = term.get("d")
|
||||||
p_term = value_to_rdflib(val.p)
|
language = term.get("l")
|
||||||
o_term = value_to_rdflib(val.o)
|
if language:
|
||||||
|
return rdflib.term.Literal(value, lang=language)
|
||||||
|
elif datatype:
|
||||||
|
return rdflib.term.Literal(value, datatype=rdflib.term.URIRef(datatype))
|
||||||
|
else:
|
||||||
|
return rdflib.term.Literal(value)
|
||||||
|
elif t == "r": # Quoted triple (RDF-star)
|
||||||
|
triple = term.get("r", {})
|
||||||
|
s_term = term_to_rdflib(triple.get("s"))
|
||||||
|
p_term = term_to_rdflib(triple.get("p"))
|
||||||
|
o_term = term_to_rdflib(triple.get("o"))
|
||||||
if s_term is None or p_term is None or o_term is None:
|
if s_term is None or p_term is None or o_term is None:
|
||||||
return None
|
return None
|
||||||
# rdflib 6.x+ supports Triple as a term type
|
|
||||||
try:
|
try:
|
||||||
return rdflib.term.Triple((s_term, p_term, o_term))
|
return rdflib.term.Triple((s_term, p_term, o_term))
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
# Fallback for older rdflib versions - represent as string
|
# Fallback for older rdflib versions
|
||||||
return rdflib.term.Literal(f"<<{val.s} {val.p} {val.o}>>")
|
return rdflib.term.Literal(f"<<{s_term} {p_term} {o_term}>>")
|
||||||
else:
|
else:
|
||||||
return rdflib.term.Literal(str(val))
|
# Fallback
|
||||||
|
return rdflib.term.Literal(str(term))
|
||||||
|
|
||||||
|
|
||||||
def show_graph(url, flow_id, user, collection):
|
def show_graph(url, flow_id, user, collection, limit, batch_size, token=None):
|
||||||
|
|
||||||
api = Api(url).flow().id(flow_id)
|
socket = Api(url, token=token).socket()
|
||||||
|
flow = socket.flow(flow_id)
|
||||||
rows = api.triples_query(
|
|
||||||
s=None, p=None, o=None,
|
|
||||||
user=user, collection=collection,
|
|
||||||
limit=10_000)
|
|
||||||
|
|
||||||
g = rdflib.Graph()
|
g = rdflib.Graph()
|
||||||
|
|
||||||
for row in rows:
|
try:
|
||||||
|
for batch in flow.triples_query_stream(
|
||||||
|
s=None, p=None, o=None,
|
||||||
|
user=user, collection=collection,
|
||||||
|
limit=limit,
|
||||||
|
batch_size=batch_size,
|
||||||
|
):
|
||||||
|
for triple in batch:
|
||||||
|
sv = term_to_rdflib(triple.get("s"))
|
||||||
|
pv = term_to_rdflib(triple.get("p"))
|
||||||
|
ov = term_to_rdflib(triple.get("o"))
|
||||||
|
|
||||||
sv = rdflib.term.URIRef(row.s)
|
if sv is None or pv is None or ov is None:
|
||||||
pv = rdflib.term.URIRef(row.p)
|
continue
|
||||||
ov = value_to_rdflib(row.o)
|
|
||||||
|
|
||||||
if ov is None:
|
g.add((sv, pv, ov))
|
||||||
continue
|
finally:
|
||||||
|
socket.close()
|
||||||
g.add((sv, pv, ov))
|
|
||||||
|
|
||||||
g.serialize(destination="output.ttl", format="turtle")
|
|
||||||
|
|
||||||
buf = io.BytesIO()
|
buf = io.BytesIO()
|
||||||
|
|
||||||
g.serialize(destination=buf, format="turtle")
|
g.serialize(destination=buf, format="turtle")
|
||||||
|
|
||||||
sys.stdout.write(buf.getvalue().decode("utf-8"))
|
sys.stdout.write(buf.getvalue().decode("utf-8"))
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -103,6 +120,26 @@ def main():
|
||||||
help=f'Collection ID (default: {default_collection})'
|
help=f'Collection ID (default: {default_collection})'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
'-t', '--token',
|
||||||
|
default=default_token,
|
||||||
|
help='Authentication token (default: $TRUSTGRAPH_TOKEN)',
|
||||||
|
)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
'-l', '--limit',
|
||||||
|
type=int,
|
||||||
|
default=10000,
|
||||||
|
help='Maximum number of triples to return (default: 10000)',
|
||||||
|
)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
'-b', '--batch-size',
|
||||||
|
type=int,
|
||||||
|
default=20,
|
||||||
|
help='Triples per streaming batch (default: 20)',
|
||||||
|
)
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
@ -112,6 +149,9 @@ def main():
|
||||||
flow_id = args.flow_id,
|
flow_id = args.flow_id,
|
||||||
user = args.user,
|
user = args.user,
|
||||||
collection = args.collection,
|
collection = args.collection,
|
||||||
|
limit = args.limit,
|
||||||
|
batch_size = args.batch_size,
|
||||||
|
token = args.token,
|
||||||
)
|
)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
"""
|
"""
|
||||||
Connects to the graph query service and dumps all graph edges.
|
Connects to the graph query service and dumps all graph edges.
|
||||||
|
Uses streaming mode for lower time-to-first-result and reduced memory overhead.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
|
@ -11,17 +12,30 @@ default_user = 'trustgraph'
|
||||||
default_collection = 'default'
|
default_collection = 'default'
|
||||||
default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
|
default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
|
||||||
|
|
||||||
def show_graph(url, flow_id, user, collection, token=None):
|
def show_graph(url, flow_id, user, collection, limit, batch_size, token=None):
|
||||||
|
|
||||||
api = Api(url, token=token).flow().id(flow_id)
|
socket = Api(url, token=token).socket()
|
||||||
|
flow = socket.flow(flow_id)
|
||||||
|
|
||||||
rows = api.triples_query(
|
try:
|
||||||
user=user, collection=collection,
|
for batch in flow.triples_query_stream(
|
||||||
s=None, p=None, o=None, limit=10_000,
|
user=user,
|
||||||
)
|
collection=collection,
|
||||||
|
s=None, p=None, o=None,
|
||||||
for row in rows:
|
limit=limit,
|
||||||
print(row.s, row.p, row.o)
|
batch_size=batch_size,
|
||||||
|
):
|
||||||
|
for triple in batch:
|
||||||
|
s = triple.get("s", {})
|
||||||
|
p = triple.get("p", {})
|
||||||
|
o = triple.get("o", {})
|
||||||
|
# Format terms for display
|
||||||
|
s_str = s.get("v", s.get("i", str(s)))
|
||||||
|
p_str = p.get("v", p.get("i", str(p)))
|
||||||
|
o_str = o.get("v", o.get("i", str(o)))
|
||||||
|
print(s_str, p_str, o_str)
|
||||||
|
finally:
|
||||||
|
socket.close()
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
||||||
|
|
@ -60,6 +74,20 @@ def main():
|
||||||
help='Authentication token (default: $TRUSTGRAPH_TOKEN)',
|
help='Authentication token (default: $TRUSTGRAPH_TOKEN)',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
'-l', '--limit',
|
||||||
|
type=int,
|
||||||
|
default=10000,
|
||||||
|
help='Maximum number of triples to return (default: 10000)',
|
||||||
|
)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
'-b', '--batch-size',
|
||||||
|
type=int,
|
||||||
|
default=20,
|
||||||
|
help='Triples per streaming batch (default: 20)',
|
||||||
|
)
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
@ -69,6 +97,8 @@ def main():
|
||||||
flow_id = args.flow_id,
|
flow_id = args.flow_id,
|
||||||
user = args.user,
|
user = args.user,
|
||||||
collection = args.collection,
|
collection = args.collection,
|
||||||
|
limit = args.limit,
|
||||||
|
batch_size = args.batch_size,
|
||||||
token = args.token,
|
token = args.token,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue