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

Fix integration issues

Browse source
This commit is contained in:
Cyber MacGeddon 2025-09-04 17:29:51 +01:00
parent ed0e02791d
commit 63800adfaa
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
trustgraph-flow/trustgraph/retrieval/nlp_query/service.py
View file

@ -122,7 +122,7 @@ class Processor(FlowProcessor):
logger.info(f"Schema configuration loaded: {len(self.schemas)} schemas") logger.info(f"Schema configuration loaded: {len(self.schemas)} schemas")
async def phase1_select_schemas(self, question: str) -> List[str]: async def phase1_select_schemas(self, question: str, flow) -> List[str]:
"""Phase 1: Use prompt service to select relevant schemas for the question""" """Phase 1: Use prompt service to select relevant schemas for the question"""
logger.info("Starting Phase 1: Schema selection") logger.info("Starting Phase 1: Schema selection")
@ -144,20 +144,27 @@ class Processor(FlowProcessor):
} }
# Call prompt service for schema selection # Call prompt service for schema selection
# Convert variables to JSON-encoded terms
terms = {k: json.dumps(v) for k, v in variables.items()}
prompt_request = PromptRequest( prompt_request = PromptRequest(
template=self.schema_selection_template, id=self.schema_selection_template,
variables=variables terms=terms
) )
try: try:
response = await self.client("prompt-request").request(prompt_request) response = await flow("prompt-request").request(prompt_request)
if response.error is not None: if response.error is not None:
raise Exception(f"Prompt service error: {response.error}") raise Exception(f"Prompt service error: {response.error}")
# Parse the response to get selected schema names # Parse the response to get selected schema names
# Expecting response.text to contain JSON array of schema names # Response could be in either text or object field
selected_schemas = json.loads(response.text) response_data = response.text if response.text else response.object
if response_data is None:
raise Exception("Prompt service returned empty response")
# Parse JSON array of schema names
selected_schemas = json.loads(response_data)
logger.info(f"Phase 1 selected schemas: {selected_schemas}") logger.info(f"Phase 1 selected schemas: {selected_schemas}")
return selected_schemas return selected_schemas
@ -166,7 +173,7 @@ class Processor(FlowProcessor):
logger.error(f"Phase 1 schema selection failed: {e}") logger.error(f"Phase 1 schema selection failed: {e}")
raise raise
async def phase2_generate_graphql(self, question: str, selected_schemas: List[str]) -> Dict[str, Any]: async def phase2_generate_graphql(self, question: str, selected_schemas: List[str], flow) -> Dict[str, Any]:
"""Phase 2: Generate GraphQL query using selected schemas""" """Phase 2: Generate GraphQL query using selected schemas"""
logger.info(f"Starting Phase 2: GraphQL generation for schemas: {selected_schemas}") logger.info(f"Starting Phase 2: GraphQL generation for schemas: {selected_schemas}")
@ -200,20 +207,27 @@ class Processor(FlowProcessor):
} }
# Call prompt service for GraphQL generation # Call prompt service for GraphQL generation
# Convert variables to JSON-encoded terms
terms = {k: json.dumps(v) for k, v in variables.items()}
prompt_request = PromptRequest( prompt_request = PromptRequest(
template=self.graphql_generation_template, id=self.graphql_generation_template,
variables=variables terms=terms
) )
try: try:
response = await self.client("prompt-request").request(prompt_request) response = await flow("prompt-request").request(prompt_request)
if response.error is not None: if response.error is not None:
raise Exception(f"Prompt service error: {response.error}") raise Exception(f"Prompt service error: {response.error}")
# Parse the response to get GraphQL query and variables # Parse the response to get GraphQL query and variables
# Expecting response.text to contain JSON with "query" and "variables" fields # Response could be in either text or object field
result = json.loads(response.text) response_data = response.text if response.text else response.object
if response_data is None:
raise Exception("Prompt service returned empty response")
# Parse JSON with "query" and "variables" fields
result = json.loads(response_data)
logger.info(f"Phase 2 generated GraphQL: {result.get('query', '')[:100]}...") logger.info(f"Phase 2 generated GraphQL: {result.get('query', '')[:100]}...")
return result return result
@ -234,10 +248,10 @@ class Processor(FlowProcessor):
logger.info(f"Handling NLP query request {id}: {request.question[:100]}...") logger.info(f"Handling NLP query request {id}: {request.question[:100]}...")
# Phase 1: Select relevant schemas # Phase 1: Select relevant schemas
selected_schemas = await self.phase1_select_schemas(request.question) selected_schemas = await self.phase1_select_schemas(request.question, flow)
# Phase 2: Generate GraphQL query # Phase 2: Generate GraphQL query
graphql_result = await self.phase2_generate_graphql(request.question, selected_schemas) graphql_result = await self.phase2_generate_graphql(request.question, selected_schemas, flow)
# Create response # Create response
response = QuestionToStructuredQueryResponse( response = QuestionToStructuredQueryResponse(