Update app.py

app.py

@@ -4,7 +4,7 @@ import json
 from datetime import datetime, timedelta
 import uuid
 from typing import Dict
-import os
+
 from config import OPENAI_API_KEY, DB_PATH, EMBED_MODEL
 from utils import get_embedding, cosine_similarity, find_top_k_matches
 from scraper import scrape_workshops_from_squarespace
@@ -24,7 +24,7 @@ from database import (
 if not OPENAI_API_KEY:
     raise ValueError("OPENAI_API_KEY not found in .env file")
 
-openai.api_key = os.environ.get("OPENAI_API_KEY")
+openai.api_key = OPENAI_API_KEY
 
 
 # Store session ID for the conversation
@@ -530,8 +530,8 @@ def process_question(question: str, current_session_id: str):
         top_faqs.append((score, entry_id, question_text, answer_text))
     top_faqs.sort(reverse=True)
 
-    faq_threshold = 0.85
-    ambiguous_threshold = 0.70
+    faq_threshold = 0.72      # Lowered from 0.85 to capture direct matches better
+    ambiguous_threshold = 0.60 # Lowered from 0.70
 
     # If high-confidence FAQ match found
     if top_faqs and top_faqs[0][0] >= faq_threshold:
@@ -569,17 +569,26 @@ def process_question(question: str, current_session_id: str):
     elif top_faqs and top_faqs[0][0] >= ambiguous_threshold:
         # AMBIGUOUS ZONE
         needs_clarification = False
+        best_match_q = top_faqs[0][2]
         
-        if not user_preference:
-             needs_clarification = True
-             
-        is_generic_query = any(w in question.lower() for w in ['price', 'cost', 'how much', 'schedule', 'when'])
-        if is_generic_query and not current_topic:
-             needs_clarification = True
-             
-        clarification_count = session_state.get('clarification_count', 0)
-        if clarification_count > 0:
+        # 1. Never clarify if the best match question is identical to the user question
+        if question.lower().strip('?') == best_match_q.lower().strip('?'):
             needs_clarification = False
+        else:
+            # 2. Check Format logic (only if locational)
+            is_locational = any(w in question.lower() for w in ['online', 'studio', 'person', 'atlanta', 'location', 'where'])
+            if is_locational and not user_preference:
+                 needs_clarification = True
+                 
+            # 3. Check Topic logic (only if generic)
+            is_generic_query = any(w in question.lower() for w in ['price', 'cost', 'how much', 'schedule', 'when'])
+            if is_generic_query and not current_topic:
+                 needs_clarification = True
+                 
+            # 4. Force resolve if already asked once
+            clarification_count = session_state.get('clarification_count', 0)
+            if clarification_count > 0:
+                needs_clarification = False 
             
         if needs_clarification:
             update_session_state(current_session_id, increment_clarification=True, increment_count=False)