mirror of
https://github.com/trustgraph-ai/trustgraph.git
synced 2026-04-28 09:56:22 +02:00
Merge 2.2 into master (#771)
This commit is contained in:
parent
dc72ed3cca
commit
befe951b2e
15 changed files with 2840 additions and 32 deletions
|
|
@ -15,7 +15,7 @@ class GraphRagClient(RequestResponse):
|
|||
user: User identifier
|
||||
collection: Collection identifier
|
||||
chunk_callback: Optional async callback(text, end_of_stream) for text chunks
|
||||
explain_callback: Optional async callback(explain_id, explain_graph) for explain notifications
|
||||
explain_callback: Optional async callback(explain_id, explain_graph, explain_triples) for explain notifications
|
||||
timeout: Request timeout in seconds
|
||||
|
||||
Returns:
|
||||
|
|
@ -30,7 +30,7 @@ class GraphRagClient(RequestResponse):
|
|||
# Handle explain notifications
|
||||
if resp.message_type == 'explain':
|
||||
if explain_callback and resp.explain_id:
|
||||
await explain_callback(resp.explain_id, resp.explain_graph)
|
||||
await explain_callback(resp.explain_id, resp.explain_graph, resp.explain_triples)
|
||||
return False # Continue receiving
|
||||
|
||||
# Handle text chunks
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class DocumentRagClient(BaseClient):
|
|||
user: User identifier
|
||||
collection: Collection identifier
|
||||
chunk_callback: Optional callback(text, end_of_stream) for text chunks
|
||||
explain_callback: Optional callback(explain_id, explain_graph) for explain notifications
|
||||
explain_callback: Optional callback(explain_id, explain_graph, explain_triples) for explain notifications
|
||||
timeout: Request timeout in seconds
|
||||
|
||||
Returns:
|
||||
|
|
@ -55,7 +55,7 @@ class DocumentRagClient(BaseClient):
|
|||
# Handle explain notifications (response is None/empty, explain_id present)
|
||||
if x.explain_id and not x.response:
|
||||
if explain_callback:
|
||||
explain_callback(x.explain_id, x.explain_graph)
|
||||
explain_callback(x.explain_id, x.explain_graph, x.explain_triples)
|
||||
return False # Continue receiving
|
||||
|
||||
# Handle text chunks
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class GraphRagClient(BaseClient):
|
|||
user: User identifier
|
||||
collection: Collection identifier
|
||||
chunk_callback: Optional callback(text, end_of_stream) for text chunks
|
||||
explain_callback: Optional callback(explain_id, explain_graph) for explain notifications
|
||||
explain_callback: Optional callback(explain_id, explain_graph, explain_triples) for explain notifications
|
||||
timeout: Request timeout in seconds
|
||||
|
||||
Returns:
|
||||
|
|
@ -59,7 +59,7 @@ class GraphRagClient(BaseClient):
|
|||
# Handle explain notifications
|
||||
if x.message_type == 'explain':
|
||||
if explain_callback and x.explain_id:
|
||||
explain_callback(x.explain_id, x.explain_graph)
|
||||
explain_callback(x.explain_id, x.explain_graph, x.explain_triples)
|
||||
return False # Continue receiving
|
||||
|
||||
# Handle text chunks
|
||||
|
|
|
|||
|
|
@ -465,11 +465,18 @@ def exploration_triples(
|
|||
return triples
|
||||
|
||||
|
||||
def _quoted_triple(s: str, p: str, o: str) -> Term:
|
||||
"""Create a quoted triple term (RDF-star) from string values."""
|
||||
def _quoted_triple(s, p, o) -> Term:
|
||||
"""Create a quoted triple term (RDF-star).
|
||||
|
||||
Accepts either Term objects (preserving original types) or plain
|
||||
strings (treated as IRIs for backward compatibility).
|
||||
"""
|
||||
s_term = s if isinstance(s, Term) else _iri(s)
|
||||
p_term = p if isinstance(p, Term) else _iri(p)
|
||||
o_term = o if isinstance(o, Term) else _iri(o)
|
||||
return Term(
|
||||
type=TRIPLE,
|
||||
triple=Triple(s=_iri(s), p=_iri(p), o=_iri(o))
|
||||
triple=Triple(s=s_term, p=p_term, o=o_term)
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue