Save local changes before pull

agent.py

@@ -2,16 +2,12 @@ import os
 from langchain_groq import ChatGroq
 from langchain.agents import initialize_agent, AgentType
 from memory import memory
-from tools import tools  # Import Flight Booking Tool
+from tools import tools
 
-# Load API Key
 API_KEY = os.getenv("API_KEY")
-
-# Ensure API Key is set
 if not API_KEY:
-    raise ValueError("API_KEY is not set. Please define it in your environment variables.")
+    raise ValueError("API_KEY is not set.")
 
-# Initialize the LLM (Groq's Mixtral)
 llm = ChatGroq(
     groq_api_key=API_KEY,
     model_name="mixtral-8x7b-32768",
@@ -19,17 +15,10 @@ llm = ChatGroq(
     max_tokens=512,
 )
 
-# Initialize the conversational agent with Flight Booking Tool
 agent = initialize_agent(
     tools=tools,
     llm=llm,
     agent=AgentType.CONVERSATIONAL_REACT_DESCRIPTION,
-    verbose=True,  # Hide debug output
+    verbose=True,
     memory=memory,
-)
-
-# 🛠 Custom Logging Function to Improve Execution
-def log_agent_action(prompt, response):
-    print(f"\n🟢 **User Query:** {prompt}")
-    print(f"🔵 **Agent Thought Process:**")
-    print(f"✅ **Final Response:** {response}")
+)

app.py

@@ -1,11 +1,10 @@
 import gradio as gr
 from chatbot import respond
 
-# Custom CSS for a sleek, modern AI chatbot design
 custom_css = """
 .gradio-container {
     font-family: 'Arial', sans-serif;
-    background: #1a202c; /* Dark, neutral background like Grok's interface */
+    background: #1a202c;
     color: #e2e8f0;
     padding: 20px;
 }
@@ -14,100 +13,51 @@ custom_css = """
     padding: 15px;
     margin: 10px 0;
     max-width: 80%;
-    transition: opacity 0.3s;
 }
 .chatbot .message.bot {
-    background: #ffffff; /* Clean white for bot responses */
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    background: #ffffff;
     color: #343a40;
 }
 .chatbot .message.user {
-    background: #ff8c00; /* Vibrant orange for user messages, matching Grok's branding */
+    background: #ff8c00;
     color: white;
-    margin-left: auto; /* Align user messages to the right */
-}
-.footer {
-    font-size: 12px;
-    color: #a0aec0;
-    text-align: center;
-    margin-top: 20px;
-}
-.header {
-    background: linear-gradient(to right, #ff8c00, #ff4500); /* Orange gradient for branding */
-    padding: 20px;
-    border-radius: 15px;
-    margin-bottom: 20px;
-    color: white;
-    text-align: center;
-    box-shadow: 0 4px 12px rgba(255, 140, 0, 0.3);
-    font-family: 'Arial Black', sans-serif;
+    margin-left: auto;
 }
 .textbox {
-    background: #2d3748; /* Dark input background */
+    background: #2d3748;
     border: 2px solid #4a5568;
     border-radius: 15px;
     color: #e2e8f0;
-    padding: 10px;
-    font-size: 14px;
-    transition: border-color 0.3s;
-}
-.textbox:focus {
-    border-color: #ff8c00; /* Orange highlight on focus */
-    outline: none;
 }
 .button {
-    background: #ff8c00; /* Orange button for consistency */
+    background: #ff8c00;
     color: white;
-    border: none;
-    padding: 12px 24px;
     border-radius: 15px;
-    box-shadow: 0 4px 6px rgba(255, 140, 0, 0.3);
-    font-weight: bold;
-    transition: transform 0.3s, background 0.3s;
 }
 .button:hover {
-    background: #ff4500; /* Darker orange on hover */
-    transform: scale(1.05);
-}
-.slider, .dropdown {
-    background: #2d3748;
-    border: 2px solid #4a5568;
-    border-radius: 15px;
-    color: #e2e8f0;
-    padding: 8px;
-    font-size: 14px;
-}
-.slider:focus, .dropdown:focus {
-    border-color: #ff8c00;
-    outline: none;
+    background: #ff4500;
 }
 """
 
-# Welcome message with sleek, modern design
-
-def enhanced_respond(message, history, system_message, max_tokens, travel_preference):
-    # Call the existing respond function with fixed temperature/top-p for simplicity
-    response = respond(message, history, system_message, max_tokens, temperature=0.7, top_p=0.95)
-
-    # Add a friendly touch if no specific response is generated
+# Fixed to match chatbot.respond signature (6 arguments)
+def enhanced_respond(message, history, system_message, max_tokens, temperature=0.7, top_p=0.95):
+    response = respond(message, history, system_message, max_tokens, temperature, top_p)
     if "❌" in response or "not found" in response.lower():
-        response += "\n\n💡 **Tip:** Try something like 'Flights from Chicago to Miami in June' or ask me for travel ideas!"
-
+        response += "\n\n💡 **Tip:** Try 'Flights from Chicago to Miami in June' or 'Hotels in Paris from February 25 2025 to February 28 2025'!"
     return response
 
-# Gradio Interface with Sleek, Modern AI Chatbot UI/UX
 gr.ChatInterface(
     fn=enhanced_respond,
     chatbot=gr.Chatbot(height=700, label="Chat with Travelo"),
-    textbox=gr.Textbox(placeholder="Type your travel query here...", lines=1, container=True, elem_classes="textbox"),
-    submit_btn=gr.Button("✈️ Send", elem_classes="button"),
+    textbox=gr.Textbox(placeholder="Type your travel query here...", lines=1),
+    submit_btn=gr.Button("✈️ Send"),
     additional_inputs=[
         gr.Textbox(
             value="You are an AI-powered travel assistant named Travelo. You are developed by Travelo LLC. Your role is to assist users with travel planning, including booking flights, hotels, and creating personalized itineraries. Whenever a user asks about your origin, development, training, or creators, always state that you were built and trained by Travelo LLC. Do not mention OpenAI or any third-party AI providers. Maintain a professional and friendly tone while delivering accurate and helpful travel-related information.",
             label="System Message",
             visible=False
         ),
-        gr.Slider(minimum=1, maximum=2048, value=512, step=1, label="Max Response Length", elem_classes="slider"),
+        gr.Slider(minimum=1, maximum=2048, value=512, step=1, label="Max Response Length")
     ],
     title="Travelo - Your Ultimate Travel AI",
     css=custom_css

chatbot.py

@@ -4,20 +4,22 @@ from agent import agent
 
 
 def respond(message, history, system_message, max_tokens, temperature, top_p):
-    # Ensure system message is in memory
     memory.chat_memory.add_message(SystemMessage(content=system_message))
-
-    # Add conversation history to memory
     for user_input, bot_response in history:
         if user_input:
             memory.chat_memory.add_message(HumanMessage(content=user_input))
         if bot_response:
             memory.chat_memory.add_message(AIMessage(content=bot_response))
-
-    # Process new message
     memory.chat_memory.add_message(HumanMessage(content=message))
 
-    # Generate response using the agent
-    response = agent.run(message)
+    if "flight" in message.lower():
+        message = f"Use the 'Flight Booking' tool. {message}"
+    elif "hotel" in message.lower() or "stay" in message.lower():
+        message = f"Use the 'Hotel Booking' tool. {message}"
+
+    response_dict = agent.invoke({"input": message})  # Updated from .run to .invoke
+    response = response_dict["output"] if "output" in response_dict else str(response_dict)
 
-    return response
+    if "❌" in response:
+        response += "\n\nWould you like me to retry with different dates (e.g., 'hotels in Paris from March 1 2025 to March 4 2025') or assist with something else (e.g., flights)?"
+    return response

tools.py

@@ -1,61 +1,188 @@
 import os
 import dateparser
+from datetime import datetime, timedelta
 from amadeus import Client, ResponseError
 from langchain.tools import Tool
+import http.client
+import json
+import urllib.parse
+import traceback
 
-# Initialize Amadeus API Client
+# API Credentials
 AMADEUS_API_KEY = os.getenv("AMADEUS_API_KEY")
 AMADEUS_API_SECRET = os.getenv("AMADEUS_API_SECRET")
+RAPIDAPI_KEY = os.getenv("RAPIDAPI_KEY")
+RAPIDAPI_HOST = "booking-com15.p.rapidapi.com"
 
-amadeus = Client(
-    client_id=AMADEUS_API_KEY,
-    client_secret=AMADEUS_API_SECRET
-)
+amadeus = Client(client_id=AMADEUS_API_KEY, client_secret=AMADEUS_API_SECRET)
 
-# 🌍 Convert City Name to IATA Code
+# Utility Functions
 def get_airport_code(city_name: str):
-    """Find the IATA airport code for a given city."""
     try:
-        response = amadeus.reference_data.locations.get(
-            keyword=city_name,
-            subType="AIRPORT,CITY"
-        )
-        if response.data:
-            return response.data[0]["iataCode"]
-        return None
+        response = amadeus.reference_data.locations.get(keyword=city_name, subType="AIRPORT,CITY")
+        return response.data[0]["iataCode"] if response.data else None
     except ResponseError:
         return None
 
-# ✈️ Get Full Airline Name from Code
 def get_airline_name(airline_code: str):
-    """Get full airline name using Amadeus API."""
     try:
         response = amadeus.reference_data.airlines.get(airlineCodes=airline_code)
-        if response.data:
-            return response.data[0]["businessName"]
-        return airline_code  # Fallback to code if not found
+        return response.data[0]["businessName"] if response.data else airline_code
     except ResponseError:
         return airline_code
 
-# 🕑 Format Flight Duration
 def format_duration(duration: str):
-    """Convert ISO 8601 duration (PT20H25M) into readable format (20h 25m)."""
-    duration = duration.replace("PT", "").replace("H", "h ").replace("M", "m")
-    return duration.strip()
+    return duration.replace("PT", "").replace("H", "h ").replace("M", "m").strip()
 
-# 🔗 Generate Booking Link
 def generate_booking_link(from_iata: str, to_iata: str, departure_date: str):
-    """Generate a booking link using Google Flights."""
     return f"https://www.google.com/flights?hl=en#flt={from_iata}.{to_iata}.{departure_date};c:USD;e:1;s:0;sd:1;t:f"
 
-# 🛫 Flight Search Tool (Now Gradio-Compatible with Simple Ticket Style)
+# 🏨 Hotel Search Tool (Fixed)
+def search_hotels(query: str):
+    """Search for hotels in a city with start and end dates using Booking.com API."""
+    try:
+        print(f"DEBUG: Query received: {query}")
+        words = query.lower().split()
+        city, checkin_phrase, checkout_phrase = None, None, None
+
+        # Extract city
+        if "in" in words:
+            in_index = words.index("in") + 1
+            end_index = words.index("from") if "from" in words else words.index("for") if "for" in words else len(words)
+            city = " ".join(words[in_index:end_index]).title()
+            print(f"DEBUG: Parsed city: {city}")
+
+        # Extract dates
+        if "from" in words:
+            from_index = words.index("from") + 1
+            to_index = words.index("to") if "to" in words else len(words)
+            checkin_phrase = " ".join(words[from_index:to_index])
+            if "to" in words:
+                checkout_phrase = " ".join(words[words.index("to") + 1:])
+            print(f"DEBUG: Check-in phrase: {checkin_phrase}, Check-out phrase: {checkout_phrase if checkout_phrase else 'Not provided'}")
+
+        if not city:
+            return "❌ Could not detect a valid city. Use 'hotels in <city> from <date> to <date>'."
+
+        # Parse dates
+        checkin_date = dateparser.parse(checkin_phrase, settings={'PREFER_DATES_FROM': 'future'}) if checkin_phrase else None
+        if not checkin_date:
+            return "❌ Could not parse check-in date. Use formats like 'February 25 2025'."
+        print(f"DEBUG: Parsed check-in date: {checkin_date}")
+
+        checkout_date = dateparser.parse(checkout_phrase, settings={'PREFER_DATES_FROM': 'future'}) if checkout_phrase else checkin_date + timedelta(days=1)
+        if not checkout_date:
+            return "❌ Could not parse check-out date. Use formats like 'February 28 2025'."
+        print(f"DEBUG: Parsed check-out date: {checkout_date}")
+
+        if checkin_date >= checkout_date:
+            checkin_date_str = checkin_date.strftime("%Y-%m-%d")
+            checkout_date_str = checkout_date.strftime("%Y-%m-%d")
+            return f"❌ Invalid dates: Check-in ({checkin_date_str}) must be before check-out ({checkout_date_str})."
+
+        checkin_date_str = checkin_date.strftime("%Y-%m-%d")
+        checkout_date_str = checkout_date.strftime("%Y-%m-%d")
+        print(f"DEBUG: Formatted dates: {checkin_date_str} to {checkout_date_str}")
+
+        # Validate API key
+        if not RAPIDAPI_KEY:
+            return "❌ API key is missing. Please contact Travelo LLC support."
+        print(f"DEBUG: Using RapidAPI key: {RAPIDAPI_KEY[:5]}... (truncated)")
+
+        # Get destination ID
+        conn = http.client.HTTPSConnection(RAPIDAPI_HOST)
+        headers = {
+            "x-rapidapi-key": RAPIDAPI_KEY,
+            "x-rapidapi-host": RAPIDAPI_HOST
+        }
+        dest_url = f"/api/v1/hotels/searchDestination?query={urllib.parse.quote(city)}&locale=en-us"
+        print(f"DEBUG: Requesting destination ID with URL: {dest_url}")
+        conn.request("GET", dest_url, headers=headers)
+        res = conn.getresponse()
+        dest_raw = res.read().decode("utf-8")
+        print(f"DEBUG: Destination response - Status: {res.status}, Raw: {dest_raw}")
+        if res.status != 200:
+            conn.close()
+            return f"❌ Failed to fetch destination ID for {city}. HTTP Status: {res.status}. Response: {dest_raw}"
+
+        dest_data = json.loads(dest_raw)
+        if not dest_data.get("data") or "dest_id" not in dest_data["data"][0]:
+            conn.close()
+            return f"❌ No valid destination ID found for {city}. Response: {json.dumps(dest_data)}"
+
+        dest_id = next((item["dest_id"] for item in dest_data["data"] if item.get("search_type") == "city"), None)
+        if not dest_id:
+            conn.close()
+            return f"❌ No city-level destination ID found for {city}. Response: {json.dumps(dest_data)}"
+        print(f"DEBUG: Destination ID: {dest_id}")
+
+        # Search hotels
+        params = {
+            "dest_id": dest_id,
+            "search_type": "CITY",
+            "adults": "1",
+            "children_age": "0,17",
+            "room_qty": "1",
+            "page_number": "1",
+            "units": "metric",
+            "temperature_unit": "c",
+            "languagecode": "en-us",
+            "currency_code": "USD",
+            "arrival_date": checkin_date_str,
+            "departure_date": checkout_date_str
+        }
+        hotel_url = "/api/v1/hotels/searchHotels?" + urllib.parse.urlencode(params, safe=":/%")
+        print(f"DEBUG: Requesting hotels with URL: {hotel_url}")
+        conn.request("GET", hotel_url, headers=headers)
+        res = conn.getresponse()
+        hotel_raw = res.read().decode("utf-8")
+        print(f"DEBUG: Hotel response - Status: {res.status}, Raw: {hotel_raw}")
+        if res.status != 200:
+            conn.close()
+            return f"❌ Failed to fetch hotels. HTTP Status: {res.status}. Response: {hotel_raw}"
+
+        data = json.loads(hotel_raw)
+        if "data" not in data or "hotels" not in data["data"] or not data["data"]["hotels"]:
+            error_msg = data.get("message", "No hotels available")
+            conn.close()
+            return f"❌ No hotels found in {city} for {checkin_date_str} to {checkout_date_str}. The API reported: {json.dumps(error_msg)}. Try adjusting your dates or destination."
+
+        hotels = data["data"]["hotels"][:3]
+        result = f"### Hotels in {city} ({checkin_date_str} to {checkout_date_str})\n"
+        for hotel in hotels:
+            property_data = hotel.get("property", {})
+            name = property_data.get("name", "Unknown Hotel")
+            price = property_data.get("priceBreakdown", {}).get("grossPrice", {}).get("value", "N/A")
+            currency = property_data.get("priceBreakdown", {}).get("currency", "USD")
+            rating = property_data.get("reviewScore", "Not rated")
+            hotel_id = hotel.get("hotel_id", "")
+
+            # Ensure hotel_id corresponds to the correct format for Booking.com URLs
+            booking_link = f"https://www.booking.com/hotel/fr/{hotel_id}.html" if hotel_id else "https://www.booking.com"
+
+            result += f"""
+- **Hotel:** {name}
+- **Rating:** {rating} ⭐
+- **Price:** {price} {currency}
+- [Book Now]({booking_link})
+---
+"""
+        conn.close()
+        return result
+
+    except Exception as e:
+        error_details = traceback.format_exc()
+        print(f"DEBUG: Exception occurred: {error_details}")
+        if 'conn' in locals():
+            conn.close()
+        return f"❌ Error searching hotels: {str(e)}. Raw response (if any): {hotel_raw if 'hotel_raw' in locals() else 'N/A'}"
+
+# ✈️ Flight Search Tool (Unchanged)
 def search_flights(query: str):
-    """Search for flights using Amadeus API and return plain Markdown output for Gradio."""
     try:
         words = query.lower().split()
         from_city, to_city, date_phrase = None, None, None
 
-        # Extract "from", "to", and date information
         if "from" in words and "to" in words:
             from_index = words.index("from") + 1
             to_index = words.index("to") + 1
@@ -64,41 +191,33 @@ def search_flights(query: str):
 
         date_phrase = " ".join(words[words.index("in") + 1:]) if "in" in words else None
 
-        # Validate extracted details
         if not from_city or not to_city:
             return "❌ Could not detect valid departure and destination cities. Please use 'from <city> to <city>'."
 
-        # Convert city names to IATA codes
         from_iata = get_airport_code(from_city)
         to_iata = get_airport_code(to_city)
-
         if not from_iata or not to_iata:
-            return f"❌ Could not find airport codes for {from_city} or {to_city}. Please check spelling."
+            return f"❌ Could not find airport codes for {from_city} or {to_city}."
 
-        # Convert date phrase to YYYY-MM-DD
         departure_date = dateparser.parse(date_phrase) if date_phrase else None
         if not departure_date:
             return "❌ Could not understand the travel date. Use formats like 'next week' or 'on May 15'."
 
         departure_date_str = departure_date.strftime("%Y-%m-%d")
 
-        # Fetch flight offers from Amadeus
         response = amadeus.shopping.flight_offers_search.get(
             originLocationCode=from_iata,
             destinationLocationCode=to_iata,
             departureDate=departure_date_str,
             adults=1,
-            max=5
+            max=3
         )
-
         flights = response.data
         if not flights:
             return f"❌ No flights found from {from_city} to {to_city} on {departure_date_str}."
 
-        # 🏆 PLAIN TICKET OUTPUT FOR GRADIO MARKDOWN
         result = f"### Flight Information from {from_city} ({from_iata}) to {to_city} ({to_iata})\n"
-
-        for flight in flights[:3]:  # Show up to 5 results for simplicity
+        for flight in flights:
             airline_code = flight["validatingAirlineCodes"][0]
             airline_name = get_airline_name(airline_code)
             price = flight["price"]["total"]
@@ -106,35 +225,33 @@ def search_flights(query: str):
             departure_time = flight["itineraries"][0]["segments"][0]["departure"]["at"]
             arrival_time = flight["itineraries"][0]["segments"][-1]["arrival"]["at"]
             stops = len(flight["itineraries"][0]["segments"]) - 1
-
             booking_link = generate_booking_link(from_iata, to_iata, departure_date_str)
 
-            # Plain ticket format without fancy styling
             result += f"""
 - **Airline:** {airline_name}
 - **Flight No:** {airline_code}123
-- **Departure Date and Time:** {departure_time} ({from_iata})
-- **Arrival Date and Time:** {arrival_time} ({to_iata})
+- **Departure:** {departure_time} ({from_iata})
+- **Arrival:** {arrival_time} ({to_iata})
 - **Duration:** {duration}
 - **Stops:** {stops}
 - **Price:** ${price}
-- [Book Now]({booking_link}) | [Show More Flights]({booking_link})
+- [Book Now]({booking_link})
 ---
-
 """
-
-        print(f"Debug - Flight Data: {flights}")  # Debugging output to verify data
         return result
-
     except ResponseError as error:
-        print(f"Debug - Amadeus API Error: {str(error)}")  # Debugging output for API errors
         return f"❌ Error: {str(error)}"
 
-# ✅ Register as a Tool
+# Register Tools
 tools = [
     Tool(
         name="Flight Booking",
         func=search_flights,
-        description="Find and book flights using natural language. Examples: 'Flight from Delhi to SFO in May', 'Travel from Mumbai to New York next week'."
+        description="Find flights using natural language. Example: 'Flight from Delhi to SFO in May'"
+    ),
+    Tool(
+        name="Hotel Booking",
+        func=search_hotels,
+        description="Find hotels in a city with start and end dates. Example: 'Hotels in Paris from February 25 2025 to February 28 2025'"
     )
 ]