Update app.py

app.py

@@ -1,4 +1,5 @@
 import os
+import re
 import requests
 import pandas as pd
 import yaml
@@ -114,23 +115,30 @@ class BasicAgent:
             description="Your friendly AI agent to help you with any task",
             prompt_templates=prompt_templates,
         )
-        # keep the fallback map on the instance
         self.rag_fallbacks = rag_fallbacks
 
     def __call__(self, question: str) -> str:
-        # first, try to run the agent
+        # 1) run the agent
         try:
-            answer = self.agent.run(question)
+            raw_ans = self.agent.run(question)
         except Exception:
-            answer = ""
+            raw_ans = ""
+        # 2) stringify for the empty/failure check
+        ans_str = str(raw_ans)
 
-        # if no answer or clearly failed, look for a keyword in our fallback map
-        if not answer or answer.strip().lower().startswith("i'm sorry"):
+        # 3) if it failed to produce anything meaningful, try RAG fallback
+        if not ans_str.strip() or ans_str.lower().startswith("i'm sorry"):
             q_low = question.lower()
             for key, val in self.rag_fallbacks.items():
-                if key in q_low:
+                # extract tokens > 2 chars from the key
+                tokens = re.findall(r"\w+", key.lower())
+                tokens = [t for t in tokens if len(t) > 2]
+                # if all appear in the question, use this fallback
+                if all(tok in q_low for tok in tokens):
                     return val
-        return answer
+
+        # otherwise return the real answer
+        return raw_ans
 
 # -----------------------------------------------------------------------------
 # 3) EVALUATION LOGIC (unchanged)