Update kig_core/graph_operations.py

kig_core/graph_operations.py

@@ -98,18 +98,18 @@ def generate_cypher_guided(question: str, plan_step: int) -> str:
              target = "(rp:ResearchPaper)"
              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, n.summary" # Assuming common fields
+             target = "(n) OPTIONAL MATCH (s:Solution)-[:SOLUTION_OF]->(n) WHERE (n):KeyIssue" # Generic fallback
+             fields = "n.title, n.description, n.summary, s.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} OPTIONAL MATCH (s:Solution)-[:SOLUTION_OF]->{target} WHERE {target}:KeyIssue RETURN {fields},s.summary"
+        cypher = f"MATCH (c:Concept {{name: $conceptName}})-[:RELATED_TO]-{target} RETURN {fields}"
         # 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} OPTIONAL MATCH (s:Solution)-[:SOLUTION_OF]->{target} WHERE {target}:KeyIssue RETURN {fields},s.summary"
+        cypher = f"MATCH (c:Concept {{name: '{escaped_concept}'}})-[:RELATED_TO]-{target} RETURN {fields}"
 
         logger.info(f"Generated guided Cypher: {cypher}")
         return cypher