apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-22 03:31:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bugs, graph-rag working

Browse source
This commit is contained in:
Cyber MacGeddon 2025-03-12 22:32:55 +00:00
parent 8830e99e57
commit 5ca910e089
5 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trustgraph-flow/trustgraph/gateway/graph_rag.py
View file

@ -23,9 +23,9 @@ class GraphRagRequestor(ServiceRequestor):
query=body["query"],
user=body.get("user", "trustgraph"),
collection=body.get("collection", "default"),
entity_limit=body.get("entity-limit", 50),
triple_limit=body.get("triple-limit", 30),
doc_limit=body.get("doc-limit", 1000),
entity_limit=int(body.get("entity-limit", 50)),
triple_limit=int(body.get("triple-limit", 30)),
max_subgraph_size=int(body.get("max-subgraph-size", 1000)),
)
def from_response(self, message):

14
trustgraph-flow/trustgraph/graph_rag.py
View file

@ -22,14 +22,14 @@ class Query:
def __init__(
self, rag, user, collection, verbose,
entity_limit=50, query_limit=30, max_subgraph_size=1000,
entity_limit=50, triple_limit=30, max_subgraph_size=1000,
):
self.rag = rag
self.user = user
self.collection = collection
self.verbose = verbose
self.entity_limit = entity_limit
self.query_limit = query_limit
self.triple_limit = triple_limit
self.max_subgraph_size = max_subgraph_size
def get_vector(self, query):
@ -99,7 +99,7 @@ class Query:
res = self.rag.triples_client.request(
user=self.user, collection=self.collection,
s=e, p=None, o=None,
limit=self.query_limit
limit=self.triple_limit
)
for triple in res:
@ -110,7 +110,7 @@ class Query:
res = self.rag.triples_client.request(
user=self.user, collection=self.collection,
s=None, p=e, o=None,
limit=self.query_limit
limit=self.triple_limit
)
for triple in res:
@ -121,7 +121,7 @@ class Query:
res = self.rag.triples_client.request(
user=self.user, collection=self.collection,
s=None, p=None, o=e,
limit=self.query_limit,
limit=self.triple_limit,
)
for triple in res:
@ -255,8 +255,8 @@ class GraphRag:
print("Construct prompt...", flush=True)
q = Query(
rag=self, user=user, collection=collection, verbose=self.verbose
entity_limit=entity_limit, query_limit=query_limit,
rag=self, user=user, collection=collection, verbose=self.verbose,
entity_limit=entity_limit, triple_limit=triple_limit,
max_subgraph_size=max_subgraph_size,
)

6
trustgraph-flow/trustgraph/retrieval/graph_rag/rag.py
View file

@ -115,17 +115,17 @@ class Processor(ConsumerProducer):
if v.entity_limit:
entity_limit = v.entity_limit
else:
entity_limit = self.entity_limit
entity_limit = self.default_entity_limit
if v.triple_limit:
triple_limit = v.triple_limit
else:
triple_limit = self.triple_limit
triple_limit = self.default_triple_limit
if v.max_subgraph_size:
max_subgraph_size = v.max_subgraph_size
else:
max_subgraph_size = self.max_subgraph_size
max_subgraph_size = self.default_max_subgraph_size
response = self.rag.query(
query=v.query, user=v.user, collection=v.collection,