Update app.py

app.py

@@ -308,12 +308,12 @@ def generate_answer(message, choice, retrieval_mode):
     logging.debug(f"generate_answer called with choice: {choice} and retrieval_mode: {retrieval_mode}")
 
     # Check if the question is about hotels
-    if "hotel" in message.lower() and "birmingham" in message.lower():
+    if "hotel" in message.lower() or if "hotels" in message.lower() and "birmingham" in message.lower():
         response = fetch_google_hotels()
         return response, extract_addresses(response)
     
     # Check if the question is about restaurants
-    if "restaurant" in message.lower() and "birmingham" in message.lower():
+    if "restaurant" in message.lower() or "restaurants" in message.lower() and "birmingham" in message.lower():
         response = fetch_yelp_restaurants()
         return response, extract_addresses(response)
     # Check if the question is about flights
@@ -600,8 +600,54 @@ def show_map_if_details(history, choice):
     else:
         return gr.update(visible(False), "")
 
+# def generate_audio_elevenlabs(text):
+#     XI_API_KEY = os.environ['ELEVENLABS_API']
+#     VOICE_ID = 'd9MIrwLnvDeH7aZb61E9'
+#     tts_url = f"https://api.elevenlabs.io/v1/text-to-speech/{VOICE_ID}/stream"
+#     headers = {
+#         "Accept": "application/json",
+#         "xi-api-key": XI_API_KEY
+#     }
+#     data = {
+#         "text": str(text),
+#         "model_id": "eleven_multilingual_v2",
+#         "voice_settings": {
+#             "stability": 1.0,
+#             "similarity_boost": 0.0,
+#             "style": 0.60,
+#             "use_speaker_boost": False
+#         }
+#     }
+#     response = requests.post(tts_url, headers=headers, json=data, stream=True)
+#     if response.ok:
+#         audio_segments = []
+#         with tempfile.NamedTemporaryFile(delete=False, suffix=".mp3") as f:
+#             for chunk in response.iter_content(chunk_size=1024):
+#                 if chunk:
+#                     f.write(chunk)
+#                     audio_segments.append(chunk)
+#             temp_audio_path = f.name
+
+#         # Combine all audio chunks into a single file
+#         combined_audio = AudioSegment.from_file(temp_audio_path, format="mp3")
+#         combined_audio_path = os.path.join(tempfile.gettempdir(), "elevenlabs_combined_audio.mp3")
+#         combined_audio.export(combined_audio_path, format="mp3")
+
+#         logging.debug(f"Audio saved to {combined_audio_path}")
+#         return combined_audio_path
+#     else:
+#         logging.error(f"Error generating audio: {response.text}")
+#         return None
+
+
+def preprocess_for_tts(text):
+    # Remove the word "Link" and any URLs from the text
+    text = re.sub(r'\bLink\b', '', text)  # Remove the word "Link"
+    text = re.sub(r'http\S+', '', text)  # Remove URLs
+    return text.strip()  # Remove any extra spaces
+
 def generate_audio_elevenlabs(text):
-    XI_API_KEY = os.environ['ELEVENLABS_API']
+    XI_API_KEY = os.getenv('ELEVENLABS_API')
     VOICE_ID = 'd9MIrwLnvDeH7aZb61E9'
     tts_url = f"https://api.elevenlabs.io/v1/text-to-speech/{VOICE_ID}/stream"
     headers = {
@@ -609,7 +655,7 @@ def generate_audio_elevenlabs(text):
         "xi-api-key": XI_API_KEY
     }
     data = {
-        "text": str(text),
+        "text": preprocess_for_tts(text),  # Apply preprocessing before sending to TTS
         "model_id": "eleven_multilingual_v2",
         "voice_settings": {
             "stability": 1.0,
@@ -620,26 +666,17 @@ def generate_audio_elevenlabs(text):
     }
     response = requests.post(tts_url, headers=headers, json=data, stream=True)
     if response.ok:
-        audio_segments = []
         with tempfile.NamedTemporaryFile(delete=False, suffix=".mp3") as f:
             for chunk in response.iter_content(chunk_size=1024):
                 if chunk:
                     f.write(chunk)
-                    audio_segments.append(chunk)
-            temp_audio_path = f.name
-
-        # Combine all audio chunks into a single file
-        combined_audio = AudioSegment.from_file(temp_audio_path, format="mp3")
-        combined_audio_path = os.path.join(tempfile.gettempdir(), "elevenlabs_combined_audio.mp3")
-        combined_audio.export(combined_audio_path, format="mp3")
-
-        logging.debug(f"Audio saved to {combined_audio_path}")
-        return combined_audio_path
+            return f.name
     else:
         logging.error(f"Error generating audio: {response.text}")
         return None
 
 
+
 repo_id = "parler-tts/parler-tts-mini-expresso"
 
 parler_model = ParlerTTSForConditionalGeneration.from_pretrained(repo_id).to(device)
@@ -930,31 +967,82 @@ def handle_retrieval_mode_change(choice):
 
 
 
-def fetch_yelp_restaurants():
-    from serpapi.google_search import GoogleSearch
-    import os
+# def fetch_yelp_restaurants():
+#     from serpapi.google_search import GoogleSearch
+#     import os
+
+#     params = {
+#       "engine": "yelp",
+#       "find_desc": "Restaurant",
+#       "find_loc": "Birmingham, AL, USA",
+#       "api_key": os.getenv("SERP_API")
+#     }
+
+#     search = GoogleSearch(params)
+#     results = search.get_dict()
+#     organic_results = results.get("organic_results", [])
 
+#     def star_rating(rating):
+#         full_stars = int(float(rating))
+#         half_star = 1 if (float(rating) - full_stars) >= 0.5 else 0
+#         empty_stars = 5 - full_stars - half_star
+#         stars = "★" * full_stars + "½" * half_star + "☆" * empty_stars
+#         return stars
+
+#     response_text = ""
+    
+#     for result in organic_results[:5]:  # Limiting to top 10 restaurants
+#         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")
+#         location = f"{name}, Birmingham, AL"
+#         link = result.get("link", "#")
+
+#         if isinstance(snippet, list):
+#             snippet = " | ".join(snippet[:5])  # Limiting to top 5 snippets
+
+#         # Format the output for each restaurant
+#         response_text += f"[{name}]({link})\n"  # Name with clickable link, no bold
+#         response_text += f"*{location}*\n"  # Location with restaurant name and "Birmingham, AL"
+#         response_text += f"**Contact No:** {phone}\n"
+#         response_text += f"**Rating:** {star_rating(rating)} ({rating} stars, {reviews} reviews)\n"
+#         response_text += f"**Snippet:** {snippet}\n"
+#         response_text += "-" * 50 + "\n"
+
+#     return response_text
+
+
+def format_restaurant_hotel_info(name, link, location, phone, rating, reviews, snippet):
+    return f"""
+    {name}
+
+    - Link: {link} 
+    - Location: {location}
+    - Contact No: {phone} 
+    - Rating: {rating} stars ({reviews} reviews) 
+    - Snippet: {snippet}
+    """
+
+def fetch_yelp_restaurants():
+    # Introductory prompt for restaurants
+    intro_prompt = "Here are some of the top-rated restaurants in Birmingham, Alabama. I hope these suggestions help you find the perfect place to enjoy your meal:"
+    
     params = {
-      "engine": "yelp",
-      "find_desc": "Restaurant",
-      "find_loc": "Birmingham, AL, USA",
-      "api_key": os.getenv("SERP_API")
+        "engine": "yelp",
+        "find_desc": "Restaurant",
+        "find_loc": "Birmingham, AL, USA",
+        "api_key": os.getenv("SERP_API")
     }
 
     search = GoogleSearch(params)
     results = search.get_dict()
     organic_results = results.get("organic_results", [])
 
-    def star_rating(rating):
-        full_stars = int(float(rating))
-        half_star = 1 if (float(rating) - full_stars) >= 0.5 else 0
-        empty_stars = 5 - full_stars - half_star
-        stars = "★" * full_stars + "½" * half_star + "☆" * empty_stars
-        return stars
-
-    response_text = ""
+    response_text = f"{intro_prompt}\n"
     
-    for result in organic_results[:5]:  # Limiting to top 10 restaurants
+    for result in organic_results[:5]:  # Limiting to top 5 restaurants
         name = result.get("title", "No name")
         rating = result.get("rating", "No rating")
         reviews = result.get("reviews", "No reviews")
@@ -963,22 +1051,83 @@ def fetch_yelp_restaurants():
         location = f"{name}, Birmingham, AL"
         link = result.get("link", "#")
 
-        if isinstance(snippet, list):
-            snippet = " | ".join(snippet[:5])  # Limiting to top 5 snippets
+        response_text += format_restaurant_hotel_info(name, link, location, phone, rating, reviews, snippet)
+    
+    return response_text
+
 
-        # Format the output for each restaurant
-        response_text += f"[{name}]({link})\n"  # Name with clickable link, no bold
-        response_text += f"*{location}*\n"  # Location with restaurant name and "Birmingham, AL"
-        response_text += f"**Contact No:** {phone}\n"
-        response_text += f"**Rating:** {star_rating(rating)} ({rating} stars, {reviews} reviews)\n"
-        response_text += f"**Snippet:** {snippet}\n"
-        response_text += "-" * 50 + "\n"
 
-    return response_text
+# def fetch_google_hotels(query="Birmingham Hotel", check_in="2024-08-14", check_out="2024-08-15", adults=2):
+#     params = {
+#         "engine": "google_hotels",
+#         "q": query,
+#         "check_in_date": check_in,
+#         "check_out_date": check_out,
+#         "adults": str(adults),
+#         "currency": "USD",
+#         "gl": "us",
+#         "hl": "en",
+#         "api_key": os.getenv("SERP_API")
+#     }
+    
+#     search = GoogleSearch(params)
+#     results = search.get_dict()
+#     hotel_results = results.get("properties", [])
+    
+  
+
+#     hotel_info = ""
+#     for hotel in hotel_results[:5]:  # Limiting to top 5 hotels
+#         name = hotel.get('name', 'No name')
+#         description = hotel.get('description', 'No description')
+#         link = hotel.get('link', '#')
+#         check_in_time = hotel.get('check_in_time', 'N/A')
+#         check_out_time = hotel.get('check_out_time', 'N/A')
+#         rate_per_night = hotel.get('rate_per_night', {}).get('lowest', 'N/A')
+#         before_taxes_fees = hotel.get('rate_per_night', {}).get('before_taxes_fees', 'N/A')
+#         total_rate = hotel.get('total_rate', {}).get('lowest', 'N/A')
+#         deal = hotel.get('deal', 'N/A')
+#         deal_description = hotel.get('deal_description', 'N/A')
+#         nearby_places = hotel.get('nearby_places', [])
+#         amenities = hotel.get('amenities', [])
+    
+#         # Adding the "Location" field
+#         location = f"{name}, Birmingham, AL"
+    
+#         hotel_info += f"**Hotel Name:** [{name}]({link})\n"
+#         hotel_info += f"**Location:** {location}\n"
+#         hotel_info += f"**Description:** {description}\n"
+#         hotel_info += f"**Check-in Time:** {check_in_time}\n"
+#         hotel_info += f"**Check-out Time:** {check_out_time}\n"
+#         hotel_info += f"**Rate per Night:** {rate_per_night} (Before taxes/fees: {before_taxes_fees})\n"
+#         hotel_info += f"**Total Rate:** {total_rate}\n"
+#         hotel_info += f"**Deal:** {deal} ({deal_description})\n"
+    
+#         if nearby_places:
+#             hotel_info += "**Nearby Places:**\n"
+#             for place in nearby_places:
+#                 place_name = place.get('name', 'Unknown Place')
+#                 transportations = place.get('transportations', [])
+#                 hotel_info += f"  - {place_name}:\n"
+#                 for transport in transportations:
+#                     transport_type = transport.get('type', 'N/A')
+#                     duration = transport.get('duration', 'N/A')
+#                     hotel_info += f"    - {transport_type}: {duration}\n"
+    
+#         if amenities:
+#             hotel_info += "**Amenities:**\n"
+#             hotel_info += ", ".join(amenities) + "\n"
+    
+#         hotel_info += "-" * 50 + "\n"
+
+#     return hotel_info
 
 
 
 def fetch_google_hotels(query="Birmingham Hotel", check_in="2024-08-14", check_out="2024-08-15", adults=2):
+    # Introductory prompt for hotels
+    intro_prompt = "Here are some of the best hotels in Birmingham, Alabama, for your stay. Each of these options offers a unique experience, whether you're looking for luxury, comfort, or convenience:"
+    
     params = {
         "engine": "google_hotels",
         "q": query,
@@ -995,49 +1144,7 @@ def fetch_google_hotels(query="Birmingham Hotel", check_in="2024-08-14", check_o
     results = search.get_dict()
     hotel_results = results.get("properties", [])
     
-    # hotel_info = ""
-    # for hotel in hotel_results[:5]:  # Limiting to top 5 hotels
-    #     name = hotel.get('name', 'No name')
-    #     description = hotel.get('description', 'No description')
-    #     link = hotel.get('link', '#')
-    #     check_in_time = hotel.get('check_in_time', 'N/A')
-    #     check_out_time = hotel.get('check_out_time', 'N/A')
-    #     rate_per_night = hotel.get('rate_per_night', {}).get('lowest', 'N/A')
-    #     before_taxes_fees = hotel.get('rate_per_night', {}).get('before_taxes_fees', 'N/A')
-    #     total_rate = hotel.get('total_rate', {}).get('lowest', 'N/A')
-    #     deal = hotel.get('deal', 'N/A')
-    #     deal_description = hotel.get('deal_description', 'N/A')
-    #     nearby_places = hotel.get('nearby_places', [])
-    #     amenities = hotel.get('amenities', [])
-
-    #     hotel_info += f"**Hotel Name:** [{name}]({link})\n"
-    #     hotel_info += f"**Description:** {description}\n"
-    #     hotel_info += f"**Check-in Time:** {check_in_time}\n"
-    #     hotel_info += f"**Check-out Time:** {check_out_time}\n"
-    #     hotel_info += f"**Rate per Night:** {rate_per_night} (Before taxes/fees: {before_taxes_fees})\n"
-    #     hotel_info += f"**Total Rate:** {total_rate}\n"
-    #     hotel_info += f"**Deal:** {deal} ({deal_description})\n"
-
-    #     if nearby_places:
-    #         hotel_info += "**Nearby Places:**\n"
-    #         for place in nearby_places:
-    #             place_name = place.get('name', 'Unknown Place')
-    #             transportations = place.get('transportations', [])
-    #             hotel_info += f"  - {place_name}:\n"
-    #             for transport in transportations:
-    #                 transport_type = transport.get('type', 'N/A')
-    #                 duration = transport.get('duration', 'N/A')
-    #                 hotel_info += f"    - {transport_type}: {duration}\n"
-
-    #     if amenities:
-    #         hotel_info += "**Amenities:**\n"
-    #         hotel_info += ", ".join(amenities) + "\n"
-
-    #     hotel_info += "-" * 50 + "\n"
-
-    # return hotel_info
-
-    hotel_info = ""
+    hotel_info = f"{intro_prompt}\n"
     for hotel in hotel_results[:5]:  # Limiting to top 5 hotels
         name = hotel.get('name', 'No name')
         description = hotel.get('description', 'No description')
@@ -1047,40 +1154,20 @@ def fetch_google_hotels(query="Birmingham Hotel", check_in="2024-08-14", check_o
         rate_per_night = hotel.get('rate_per_night', {}).get('lowest', 'N/A')
         before_taxes_fees = hotel.get('rate_per_night', {}).get('before_taxes_fees', 'N/A')
         total_rate = hotel.get('total_rate', {}).get('lowest', 'N/A')
-        deal = hotel.get('deal', 'N/A')
-        deal_description = hotel.get('deal_description', 'N/A')
-        nearby_places = hotel.get('nearby_places', [])
-        amenities = hotel.get('amenities', [])
-    
-        # Adding the "Location" field
+        
         location = f"{name}, Birmingham, AL"
-    
-        hotel_info += f"**Hotel Name:** [{name}]({link})\n"
-        hotel_info += f"**Location:** {location}\n"
-        hotel_info += f"**Description:** {description}\n"
-        hotel_info += f"**Check-in Time:** {check_in_time}\n"
-        hotel_info += f"**Check-out Time:** {check_out_time}\n"
-        hotel_info += f"**Rate per Night:** {rate_per_night} (Before taxes/fees: {before_taxes_fees})\n"
-        hotel_info += f"**Total Rate:** {total_rate}\n"
-        hotel_info += f"**Deal:** {deal} ({deal_description})\n"
-    
-        if nearby_places:
-            hotel_info += "**Nearby Places:**\n"
-            for place in nearby_places:
-                place_name = place.get('name', 'Unknown Place')
-                transportations = place.get('transportations', [])
-                hotel_info += f"  - {place_name}:\n"
-                for transport in transportations:
-                    transport_type = transport.get('type', 'N/A')
-                    duration = transport.get('duration', 'N/A')
-                    hotel_info += f"    - {transport_type}: {duration}\n"
-    
-        if amenities:
-            hotel_info += "**Amenities:**\n"
-            hotel_info += ", ".join(amenities) + "\n"
-    
-        hotel_info += "-" * 50 + "\n"
 
+        hotel_info += format_hotel_info(
+            name, 
+            link, 
+            location, 
+            rate_per_night, 
+            total_rate, 
+            description, 
+            check_in_time, 
+            check_out_time
+        )
+    
     return hotel_info