Update app.py

app.py

@@ -277,117 +277,31 @@ def generate_answer(message, choice, retrieval_mode):
     else:
         return "Invalid retrieval mode selected.", []
 
-# def bot(history, choice, tts_choice, retrieval_mode):
-#     if not history:
-#         return history
-    
-#     response, addresses = generate_answer(history[-1][0], choice, retrieval_mode)
-#     history[-1][1] = ""
-
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         if tts_choice == "Alpha":
-#             audio_future = executor.submit(generate_audio_elevenlabs, response)
-#         elif tts_choice == "Beta":
-#             audio_future = executor.submit(generate_audio_parler_tts, response)
-#         elif tts_choice == "Gamma":
-#             audio_future = executor.submit(generate_audio_mars5, response)
-
-#         for character in response:
-#             history[-1][1] += character
-#             time.sleep(0.05)
-#             yield history, None
-
-#         audio_path = audio_future.result()
-#         yield history, audio_path
-
-#     history.append([response, None])  # Ensure the response is added in the correct format
-
-
 def bot(history, choice, tts_choice, retrieval_mode):
     if not history:
         return history
     
-    user_message = history[-1][0].lower()
-
-    # Check if the query is related to restaurants
-    if "restaurant" in user_message:
-        response = process_restaurant_query(user_message)
-    else:
-        # Continue with the normal process if not a restaurant query
-        response, addresses = generate_answer(user_message, choice, retrieval_mode)
-        history[-1][1] = ""
-
-        with concurrent.futures.ThreadPoolExecutor() as executor:
-            if tts_choice == "Alpha":
-                audio_future = executor.submit(generate_audio_elevenlabs, response)
-            elif tts_choice == "Beta":
-                audio_future = executor.submit(generate_audio_parler_tts, response)
-            elif tts_choice == "Gamma":
-                audio_future = executor.submit(generate_audio_mars5, response)
-
-            for character in response:
-                history[-1][1] += character
-                time.sleep(0.05)
-                yield history, None
-
-            audio_path = audio_future.result()
-            yield history, audio_path
-
-    history.append([response, None])  # Ensure the response is added in the correct format
+    response, addresses = generate_answer(history[-1][0], choice, retrieval_mode)
+    history[-1][1] = ""
 
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        if tts_choice == "Alpha":
+            audio_future = executor.submit(generate_audio_elevenlabs, response)
+        elif tts_choice == "Beta":
+            audio_future = executor.submit(generate_audio_parler_tts, response)
+        elif tts_choice == "Gamma":
+            audio_future = executor.submit(generate_audio_mars5, response)
 
-def format_restaurant_info(restaurant_info):
-    if not isinstance(restaurant_info, list):  # Check if it's not a list
-        print("Error: restaurant_info is not a list")  # Add a helpful error message
-        return "Error: Unable to retrieve restaurant information."
-
-    formatted_info = []
-    for restaurant in restaurant_info:
-        if not isinstance(restaurant, dict):  # Ensure each item is a dictionary
-            continue
-        formatted_info.append(
-            f"**Name:** {restaurant.get('name', 'N/A')}\n"
-            f"**Rating:** {restaurant.get('rating', 'N/A')} stars\n"
-            f"**Reviews:** {restaurant.get('reviews', 'N/A')}\n"
-            f"**Phone:** {restaurant.get('phone', 'N/A')}\n"
-            f"**Snippet:** {restaurant.get('snippet', 'N/A')}\n"
-            f"**Services:** {restaurant.get('services', 'N/A')}\n"
-            f"**Yelp URL:** [Link]({restaurant.get('link', '#')})\n"
-        )
-    return "\n\n".join(formatted_info)
-
+        for character in response:
+            history[-1][1] += character
+            time.sleep(0.05)
+            yield history, None
 
-def fetch_yelp_restaurants():
-    params = {
-        "engine": "yelp",
-        "find_desc": "Restaurant",
-        "find_loc": "Birmingham, AL, USA",  # Fixed location
-        "api_key": os.getenv("SERP_API")
-    }
+        audio_path = audio_future.result()
+        yield history, audio_path
 
-    search = GoogleSearch(params)
-    results = search.get_dict()
-    organic_results = results.get("organic_results", [])
+    history.append([response, None])  # Ensure the response is added in the correct format
 
-    yelp_data = []
-    for result in organic_results:
-        restaurant_info = {
-            "name": result.get("title", "No name"),
-            "rating": result.get("rating", "No rating"),
-            "reviews": result.get("reviews", "No reviews"),
-            "phone": result.get("phone", "Not Available"),
-            "snippet": result.get("snippet", "Not Available"),
-            "services": result.get("service_options", "Not Known"),
-            "link": result.get("link", "#")
-        }
-        yelp_data.append(restaurant_info)
-    return yelp_data
-
-def process_restaurant_query(query):
-    restaurant_info = fetch_yelp_restaurants()
-    print("DEBUG: restaurant_info =", restaurant_info)  # Add this line for debugging
-    formatted_info = format_restaurant_info(restaurant_info)
-    return formatted_info