improving tool use and graph query logic

agent.py

@@ -50,7 +50,7 @@ agent_llm = ChatOpenAI(
     openai_api_key=OPENAI_API_KEY,
     model=OPENAI_MODEL,
     temperature=0.1,
-    streaming=False  # Disable streaming for agent
+    streaming=True  # Disable streaming for agent
 )
 
 movie_chat = chat_prompt | llm | StrOutputParser()
@@ -66,19 +66,25 @@ def football_chat_wrapper(input_text):
 # Define the tools
 tools = [
     Tool.from_function(
-        name="General Football Chat",
-        description="For general football chat not covered by other tools",
-        func=football_chat_wrapper,
-    ), 
+        name="49ers Graph Search",
+        description="""Use for ANY specific 49ers-related queries about players, games, schedules, fans, or team info.
+Examples: "Who are the 49ers playing next week?", "Which players are defensive linemen?", "How many fan chapters are in California?"
+This is your PRIMARY tool for 49ers-specific information and should be your DEFAULT choice for most queries.""",
+        func=cypher_qa_wrapper
+    ),
     Tool.from_function(
         name="Game Summary Search",  
-        description="ONLY use this when specifically searching for details about a particular game or match result",
+        description="""ONLY use for detailed game summaries or specific match results.
+Examples: "What happened in the 49ers vs Seahawks game?", "Give me details about the last playoff game"
+Do NOT use for general schedule or player questions.""",
         func=get_game_summary, 
     ),
     Tool.from_function(
-        name="49ers Graph Search",
-        description="Use this for ANY questions about 49ers players, games, schedules team info, fans, or relationships - this should be your DEFAULT tool for 49ers-related queries",
-        func=cypher_qa_wrapper
+        name="General Football Chat",
+        description="""ONLY use for general football discussion NOT specific to 49ers data.
+Examples: "How does the NFL draft work?", "What are the basic rules of football?"
+Do NOT use for any 49ers-specific questions.""",
+        func=football_chat_wrapper,
     )
 ]
 

prompts.py

@@ -6,6 +6,13 @@ Do not answer any questions that do not relate to the 49ers, players, or fans.
 
 Do not answer any questions using your pre-trained knowledge, only use the information provided in the context.
 
+IMPORTANT TOOL SELECTION GUIDELINES:
+1. For ANY 49ers-specific questions about players, games, schedules, fans, or team info, ALWAYS use the "49ers Graph Search" tool first
+2. ONLY use "Game Summary Search" for detailed game summaries or specific match results
+3. ONLY use "General Football Chat" for non-49ers football questions
+
+When in doubt, default to using "49ers Graph Search" for any 49ers-related questions.
+
 TOOLS:
 ------
 
@@ -29,6 +36,24 @@ Thought: Do I need to use a tool? No
 Final Answer: [your response here]
 ```
 
+Example 1:
+User: "Who is the quarterback for the 49ers?"
+Thought: This is asking about a specific 49ers player position, so I should use the 49ers Graph Search tool.
+Action: 49ers Graph Search
+Action Input: Who is the quarterback for the 49ers?
+
+Example 2:
+User: "Tell me about the last game against the Seahawks"
+Thought: This is asking for details about a specific game, so I should use the Game Summary Search tool.
+Action: Game Summary Search
+Action Input: Tell me about the last game against the Seahawks
+
+Example 3:
+User: "How does the NFL draft work?"
+Thought: This is asking about general NFL rules, not specific to the 49ers, so I should use the General Football Chat tool.
+Action: General Football Chat
+Action Input: How does the NFL draft work?
+
 Begin!
 
 Previous conversation history:
@@ -156,4 +181,4 @@ MATCH (f:Fan)
 WHERE NOT (f)-[:MEMBER_OF]->(:Community)
 RETURN f.first_name AS firstName, f.last_name AS lastName, f.email AS email
 ```
-"""
+"""

tools/cypher.py

@@ -14,6 +14,8 @@ Do not use any other relationship types or properties that are not provided.
 
 Do not return entire nodes or embedding properties.
 
+IMPORTANT: Always use case-insensitive comparisons in your Cypher queries by applying toLower() to both the property and the search string, or by using the =~ operator with (?i) for case-insensitive regex matching. This ensures that user queries match regardless of capitalization.
+
 Example Cypher Statements for 49ers Graph:
 
 1. Count All Nodes:
@@ -54,14 +56,16 @@ RETURN c.fan_chapter_name AS chapterName, count(f) AS fanCount
 ORDER BY fanCount DESC
 LIMIT 5
 
-8. Find Fans Favoriting a Specific Player & Community:
-MATCH (f:Fan)-[:FAVORITE_PLAYER]->(p:Player {{ name: "Nick Bosa" }})
-MATCH (f)-[:MEMBER_OF]->(c:Community {{ fan_chapter_name: "Niner Empire Hawaii 808" }})
+8. Find Fans Favoriting a Specific Player & Community (Case-Insensitive):
+MATCH (f:Fan)-[:FAVORITE_PLAYER]->(p:Player)
+WHERE toLower(p.name) = toLower("Nick Bosa")
+MATCH (f)-[:MEMBER_OF]->(c:Community)
+WHERE toLower(c.fan_chapter_name) = toLower("Niner Empire Hawaii 808")
 RETURN f.first_name AS firstName, f.last_name AS lastName, c.fan_chapter_name AS community
 
-9. Upcoming Home Games:
+9. Upcoming Home Games (Case-Insensitive):
 MATCH (g:Game)
-WHERE g.home_team = "San Francisco 49ers"
+WHERE toLower(g.home_team) = toLower("San Francisco 49ers")
 RETURN g.date AS date, g.location AS location, g.away_team AS awayTeam
 ORDER BY date
 
@@ -72,12 +76,20 @@ RETURN g.date AS date, g.home_team AS home, g.away_team AS away, g.result AS fin
 ORDER BY date DESC
 LIMIT 5
 
-11. Games Played at a Specific Location:
-MATCH (g:Game {{ location: "Levi's Stadium" }})
+11. Games Played at a Specific Location (Case-Insensitive):
+MATCH (g:Game)
+WHERE toLower(g.location) = toLower("Levi's Stadium")
 RETURN g.date AS date, g.home_team AS homeTeam, g.away_team AS awayTeam, g.result AS finalScore
 
-12. Find Fans in a Specific Community:
-MATCH (f:Fan)-[:MEMBER_OF]->(c:Community {{ fan_chapter_name: "Bay Area 49ers Fans" }})
+12. Find Fans in a Specific Community (Case-Insensitive):
+MATCH (f:Fan)-[:MEMBER_OF]->(c:Community)
+WHERE toLower(c.fan_chapter_name) = toLower("Bay Area 49ers Fans")
+RETURN f.first_name AS firstName, f.last_name AS lastName
+ORDER BY lastName
+
+12b. Find Fans in a Community (Using Regex, Case-Insensitive):
+MATCH (f:Fan)-[:MEMBER_OF]->(c:Community)
+WHERE c.fan_chapter_name =~ '(?i).*bay area.*'
 RETURN f.first_name AS firstName, f.last_name AS lastName
 ORDER BY lastName
 
@@ -91,6 +103,18 @@ MATCH (f:Fan)
 WHERE NOT (f)-[:MEMBER_OF]->(:Community)
 RETURN f.first_name AS firstName, f.last_name AS lastName, f.email AS email
 
+15. Case-Insensitive Player Search:
+MATCH (p:Player)
+WHERE toLower(p.position) = toLower("QB")  // Case-insensitive position filter
+RETURN p.name AS playerName, p.position AS position, p.jersey_number AS jerseyNumber
+ORDER BY p.jersey_number
+
+16. Case-Insensitive Team Search:
+MATCH (g:Game)
+WHERE toLower(g.away_team) CONTAINS toLower("seahawks")  // Case-insensitive team search
+RETURN g.date AS date, g.home_team AS home, g.away_team AS away, g.result AS finalScore
+ORDER BY date DESC
+
 Schema:
 {schema}
 
@@ -112,7 +136,23 @@ cypher_qa = GraphCypherQAChain.from_llm(
 def cypher_qa_wrapper(input_text):
     """Wrapper function to handle input format and potential errors"""
     try:
-        return cypher_qa.invoke({"query": input_text})
+        # Log the incoming query for debugging
+        print(f"Processing query: {input_text}")
+        
+        # Process the query through the Cypher QA chain
+        result = cypher_qa.invoke({"query": input_text})
+        
+        # If we have access to the generated Cypher query, we could modify it here
+        # to ensure case-insensitivity, but the GraphCypherQAChain already executes
+        # the query. Instead, we rely on the prompt engineering approach to ensure
+        # the LLM generates case-insensitive queries.
+        
+        # Log the result for debugging
+        if "intermediate_steps" in result:
+            generated_cypher = result["intermediate_steps"][0]["query"]
+            print(f"Generated Cypher query: {generated_cypher}")
+        
+        return result
     except Exception as e:
         print(f"Error in cypher_qa: {str(e)}")
         return {"output": "I apologize, but I encountered an error while searching the database. Could you please rephrase your question?"}