Update app.py

app.py

@@ -346,6 +346,41 @@ def generate_answer(message, choice, retrieval_mode):
 
 
 
+# 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] = ""
+
+#     # Detect if the response is from Yelp (i.e., HTML formatted response)
+#     if "<table>" in response:
+#         for chunk in response.splitlines():
+#             history[-1][1] += chunk + "\n"
+#             time.sleep(0.1)  # Adjust the delay as needed
+#             yield history, None
+#         return
+
+#     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
@@ -379,6 +414,12 @@ def bot(history, choice, tts_choice, retrieval_mode):
 
     history.append([response, None])  # Ensure the response is added in the correct format
 
+    # Update the map if there are addresses found in the response
+    if addresses:
+        map_html = update_map_with_response(history)
+        yield history, map_html
+
+
 
 
 
@@ -991,50 +1032,93 @@ 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 = ""
     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', '#')
-        latitude = hotel.get('gps_coordinates', {}).get('latitude', 'N/A')
-        longitude = hotel.get('gps_coordinates', {}).get('longitude', 'N/A')
-        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"**Location:** Latitude: {latitude}, Longitude: {longitude}\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
+    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