This commit is contained in:
Cyber MacGeddon 2026-04-21 12:33:36 +01:00
parent 4b11725bfe
commit 70e5781c3b
2 changed files with 8 additions and 4 deletions

View file

@ -26,10 +26,11 @@ LABEL="http://www.w3.org/2000/01/rdf-schema#label"
class Query:
def __init__(
self, rag, user, collection, verbose,
self, rag, workspace, user, collection, verbose,
doc_limit=20, track_usage=None,
):
self.rag = rag
self.workspace = workspace
self.user = user
self.collection = collection
self.verbose = verbose
@ -122,7 +123,7 @@ class Query:
for match in chunk_matches:
if match.chunk_id:
try:
content = await self.rag.fetch_chunk(match.chunk_id, self.user)
content = await self.rag.fetch_chunk(match.chunk_id, self.workspace)
docs.append(content)
chunk_ids.append(match.chunk_id)
except Exception as e:
@ -154,7 +155,7 @@ class DocumentRag:
logger.debug("DocumentRag initialized")
async def query(
self, query, user="trustgraph", collection="default",
self, query, workspace="default", user="", collection="default",
doc_limit=20, streaming=False, chunk_callback=None,
explain_callback=None, save_answer_callback=None,
):
@ -210,7 +211,8 @@ class DocumentRag:
await explain_callback(q_triples, q_uri)
q = Query(
rag=self, user=user, collection=collection, verbose=self.verbose,
rag=self, workspace=workspace, user=user, collection=collection,
verbose=self.verbose,
doc_limit=doc_limit, track_usage=track_usage,
)

View file

@ -201,6 +201,7 @@ class Processor(FlowProcessor):
# All chunks (including final one with end_of_stream=True) are sent via callback
response, usage = await self.rag.query(
v.query,
workspace=flow.workspace,
user=v.user,
collection=v.collection,
doc_limit=doc_limit,
@ -226,6 +227,7 @@ class Processor(FlowProcessor):
# Non-streaming path - single response with answer and token usage
response, usage = await self.rag.query(
v.query,
workspace=flow.workspace,
user=v.user,
collection=v.collection,
doc_limit=doc_limit,