Update app.py

app.py

@@ -967,51 +967,7 @@ def handle_retrieval_mode_change(choice):
 
 
 
-# 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):
@@ -1124,6 +1080,19 @@ def fetch_yelp_restaurants():
 
 
 
+def format_hotel_info(name, link, location, rate_per_night, total_rate, description, check_in_time, check_out_time, amenities):
+    return f"""
+    {name}
+
+    - Link: {link} 
+    - Location: {location}
+    - Rate per Night: {rate_per_night} (Before taxes/fees: {total_rate})
+    - Check-in Time: {check_in_time}
+    - Check-out Time: {check_out_time}
+    - Amenities: {amenities}
+    - Description: {description}
+    """
+
 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:"
@@ -1154,6 +1123,7 @@ 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')
+        amenities = ", ".join(hotel.get('amenities', [])) if hotel.get('amenities') else "Not Available"
         
         location = f"{name}, Birmingham, AL"
 
@@ -1165,25 +1135,86 @@ def fetch_google_hotels(query="Birmingham Hotel", check_in="2024-08-14", check_o
             total_rate, 
             description, 
             check_in_time, 
-            check_out_time
+            check_out_time,
+            amenities
         )
     
     return hotel_info
 
 
 
-def fetch_google_flights(departure_id="JFK", arrival_id="BHM", outbound_date="2024-08-14", return_date="2024-08-20"):
+# def fetch_google_flights(departure_id="JFK", arrival_id="BHM", outbound_date="2024-08-14", return_date="2024-08-20"):
+    
+
+#     params = {
+#       "engine": "google_flights",
+#       "departure_id": departure_id,
+#       "arrival_id": arrival_id,
+#       "outbound_date": outbound_date,
+#       "return_date": return_date,
+#       "currency": "USD",
+#       "hl": "en",
+#       "api_key": os.getenv("SERP_API")  # Replace with your actual API key
+#     }
+    
+#     search = GoogleSearch(params)
+#     results = search.get_dict()
     
+#     # Extract flight details from the results
+#     best_flights = results.get('best_flights', [])
+#     formatted_flights = []
+    
+#     # Process each flight in the best_flights list
+#     for i, flight in enumerate(best_flights, start=1):
+#         flight_info = f"Flight {i}:\n"
+        
+#         for segment in flight.get('flights', []):
+#             departure_airport = segment.get('departure_airport', {}).get('name', 'Unknown Departure Airport')
+#             departure_time = segment.get('departure_airport', {}).get('time', 'Unknown Time')
+#             arrival_airport = segment.get('arrival_airport', {}).get('name', 'Unknown Arrival Airport')
+#             arrival_time = segment.get('arrival_airport', {}).get('time', 'Unknown Time')
+#             duration = segment.get('duration', 'Unknown Duration')
+#             airplane = segment.get('airplane', 'Unknown Airplane')
+            
+#             # Format the flight segment details
+#             flight_info += f"  - Departure: {departure_airport} at {departure_time}\n"
+#             flight_info += f"  - Arrival: {arrival_airport} at {arrival_time}\n"
+#             flight_info += f"  - Duration: {duration} minutes\n"
+#             flight_info += f"  - Airplane: {airplane}\n"
+        
+#         formatted_flights.append(flight_info)
+    
+#     # Combine the formatted flight information into a single output
+#     final_output = "Here are some available flights for today:\n\n" + "\n".join(formatted_flights)
+    
+   
 
+
+#     return final_output
+
+def format_flight_info(flight_number, departure_airport, departure_time, arrival_airport, arrival_time, duration, airplane):
+    return f"""
+    Flight {flight_number}
+
+    - Departure: {departure_airport} at {departure_time}
+    - Arrival: {arrival_airport} at {arrival_time}
+    - Duration: {duration} minutes
+    - Airplane: {airplane}
+    """
+
+def fetch_google_flights(departure_id="JFK", arrival_id="BHM", outbound_date="2024-08-14", return_date="2024-08-20"):
+    # Introductory prompt for flights
+    intro_prompt = "Here are some available flights from JFK to Birmingham, Alabama. These options provide a range of times and durations to fit your travel needs:"
+    
     params = {
-      "engine": "google_flights",
-      "departure_id": departure_id,
-      "arrival_id": arrival_id,
-      "outbound_date": outbound_date,
-      "return_date": return_date,
-      "currency": "USD",
-      "hl": "en",
-      "api_key": os.getenv("SERP_API")  # Replace with your actual API key
+        "engine": "google_flights",
+        "departure_id": departure_id,
+        "arrival_id": arrival_id,
+        "outbound_date": outbound_date,
+        "return_date": return_date,
+        "currency": "USD",
+        "hl": "en",
+        "api_key": os.getenv("SERP_API")
     }
     
     search = GoogleSearch(params)
@@ -1191,12 +1222,10 @@ def fetch_google_flights(departure_id="JFK", arrival_id="BHM", outbound_date="20
     
     # Extract flight details from the results
     best_flights = results.get('best_flights', [])
-    formatted_flights = []
+    flight_info = f"{intro_prompt}\n"
     
     # Process each flight in the best_flights list
     for i, flight in enumerate(best_flights, start=1):
-        flight_info = f"Flight {i}:\n"
-        
         for segment in flight.get('flights', []):
             departure_airport = segment.get('departure_airport', {}).get('name', 'Unknown Departure Airport')
             departure_time = segment.get('departure_airport', {}).get('time', 'Unknown Time')
@@ -1206,22 +1235,17 @@ def fetch_google_flights(departure_id="JFK", arrival_id="BHM", outbound_date="20
             airplane = segment.get('airplane', 'Unknown Airplane')
             
             # Format the flight segment details
-            flight_info += f"  - Departure: {departure_airport} at {departure_time}\n"
-            flight_info += f"  - Arrival: {arrival_airport} at {arrival_time}\n"
-            flight_info += f"  - Duration: {duration} minutes\n"
-            flight_info += f"  - Airplane: {airplane}\n"
-        
-        formatted_flights.append(flight_info)
-    
-    # Combine the formatted flight information into a single output
-    final_output = "Here are some available flights for today:\n\n" + "\n".join(formatted_flights)
+            flight_info += format_flight_info(
+                flight_number=i, 
+                departure_airport=departure_airport, 
+                departure_time=departure_time, 
+                arrival_airport=arrival_airport, 
+                arrival_time=arrival_time, 
+                duration=duration, 
+                airplane=airplane
+            )
     
-   
-
-
-    return final_output
-
-
+    return flight_info