Update kig_core/graph_operations.py

kig_core/graph_operations.py

@@ -88,27 +88,27 @@ def generate_cypher_guided(question: str, plan_step: int) -> str:
                  return "" # Return empty query if concept is invalid
              selected_concept = found_match
 
-
         # Determine the target node type based on plan step (example logic)
         # This mapping might need adjustment based on the actual plan structure
         if plan_step <= 1: # Steps 0 and 1: Context gathering
              target = "(ts:TechnicalSpecification)"
-             fields = "ts.title, ts.scope, ts.description"
+             fields = "ts.title, ts.scope, ts.description, ts.summary"
         elif plan_step == 2: # Step 2: Research papers?
              target = "(rp:ResearchPaper)"
-             fields = "rp.title, rp.abstract"
+             fields = "rp.title, rp.abstract, rp.summary"
         else: # Later steps might involve KeyIssues themselves or other types
              target = "(n)" # Generic fallback
-             fields = "n.title, n.description" # Assuming common fields
+             fields = "n.title, n.description, n.summary" # Assuming common fields
 
         # Construct Cypher query
         # Ensure selected_concept is properly escaped if needed, though parameters are safer
-        cypher = f"MATCH (c:Concept {{name: $conceptName}})-[:RELATED_TO]-{target} RETURN {fields}"
+
+        cypher = f"MATCH (c:Concept {{name: $conceptName}})-[:RELATED_TO]-{target} OPTIONAL MATCH (s:Solution)-[:SOLUTION_OF]->{target} WHERE {target}:KeyIssue RETURN {fields},s.summary LIMIT 10"
         # We return the query and the parameters separately for safe execution
         # However, the planner currently expects just the string. Let's construct it directly for now.
         # Be cautious about injection if concept names can contain special chars. Binding is preferred.
         escaped_concept = selected_concept.replace("'", "\\'") # Basic escaping
-        cypher = f"MATCH (c:Concept {{name: '{escaped_concept}'}})-[:RELATED_TO]-{target} RETURN {fields}"
+        cypher = f"MATCH (c:Concept {{name: '{escaped_concept}'}})-[:RELATED_TO]-{target} OPTIONAL MATCH (s:Solution)-[:SOLUTION_OF]->{target} WHERE {target}:KeyIssue RETURN {fields},s.summary LIMIT 10"
 
         logger.info(f"Generated guided Cypher: {cypher}")
         return cypher
@@ -182,7 +182,7 @@ def evaluate_documents(
                 result = invoke_llm(binary_grader,{"question": query, "document": formatted_doc})
                 logger.debug(f"Binary grader result for doc '{doc.get('title', 'N/A')}': {result}")
                 if result and 'yes' in result.lower():
-                    valid_docs_with_scores.append((doc, 1.0)) # Score 1.0 for relevant
+                    valid_docs_with_scores.append((doc, 1.0))
             except Exception as e:
                 logger.warning(f"Binary grading failed for a document: {e}", exc_info=True)