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

Add user/collection metadata to query

Browse source
This commit is contained in:
Cyber MacGeddon 2024-10-02 11:53:56 +01:00
parent 8e800a0d4a
commit ac91df91d0
4 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trustgraph-base/trustgraph/clients/graph_rag_client.py
View file

@ -38,9 +38,12 @@ class GraphRagClient(BaseClient):
output_schema=GraphRagResponse,
)
def request(self, query, timeout=500):
def request(
self, query, user="trustgraph", collection="default",
timeout=500
):
return self.call(
query=query, timeout=timeout
user=user, collection=collection, query=query, timeout=timeout
).response

4
trustgraph-base/trustgraph/schema/retrieval.py
View file

@ -9,6 +9,8 @@ from . types import Error, Value
class GraphRagQuery(Record):
query = String()
user = String()
collection = String()
class GraphRagResponse(Record):
error = Error()
@ -27,6 +29,8 @@ graph_rag_response_queue = topic(
class DocumentRagQuery(Record):
query = String()
user = String()
collection = String()
class DocumentRagResponse(Record):
error = Error()

27
trustgraph-cli/scripts/tg-query-document-rag
View file

@ -9,17 +9,19 @@ import os
from trustgraph.clients.document_rag_client import DocumentRagClient
default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
default_user = 'trustgraph'
default_collection = 'default'
def query(pulsar, query):
def query(pulsar_host, query, user, collection):
rag = DocumentRagClient(pulsar_host=pulsar)
resp = rag.request(query)
resp = rag.request(user=user, collection=collection, query=query)
print(resp)
def main():
parser = argparse.ArgumentParser(
prog='graph-show',
prog='tg-query-document-rag',
description=__doc__,
)
@ -35,11 +37,28 @@ def main():
help=f'Query to execute',
)
parser.add_argument(
'-u', '--user',
default=default_user,
help=f'User ID (default: {default_user})'
)
parser.add_argument(
'-c', '--collection',
default=default_collection,
help=f'Collection ID (default: {default_collection})'
)
args = parser.parse_args()
try:
query(args.pulsar_host, args.query)
query(
pulsar_host=args.pulsar_host,
query=args.query,
user=args.user,
collection=args.collection,
)
except Exception as e:

29
trustgraph-cli/scripts/tg-query-graph-rag
View file

@ -9,17 +9,19 @@ import os
from trustgraph.clients.graph_rag_client import GraphRagClient
default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
default_user = 'trustgraph'
default_collection = 'default'
def query(pulsar, query):
def query(pulsar_host, query, user, collection):
rag = GraphRagClient(pulsar_host=pulsar)
resp = rag.request(query)
rag = GraphRagClient(pulsar_host=pulsar_host)
resp = rag.request(user=user, collection=collection, query=query)
print(resp)
def main():
parser = argparse.ArgumentParser(
prog='graph-show',
prog='tg-graph-query-rag',
description=__doc__,
)
@ -35,11 +37,28 @@ def main():
help=f'Query to execute',
)
parser.add_argument(
'-u', '--user',
default=default_user,
help=f'User ID (default: {default_user})'
)
parser.add_argument(
'-c', '--collection',
default=default_collection,
help=f'Collection ID (default: {default_collection})'
)
args = parser.parse_args()
try:
query(args.pulsar_host, args.query)
query(
pulsar_host=args.pulsar_host,
query=args.query,
user=args.user,
collection=args.collection,
)
except Exception as e: