Update app.py

simpler version

app.py

@@ -5,20 +5,19 @@ import requests
 from smolagents import CodeAgent, DuckDuckGoSearchTool, HfApiModel, load_tool, tool
 from tools.final_answer import FinalAnswerTool
 from Gradio_UI import GradioUI
-import yaml
 
 # ======================
-# MINIMAL TRAVEL TOOLS (SMOLAGENTS-COMPLIANT)
+# MINIMAL COMPLIANT TOOLS (Google-style docstrings REQUIRED)
 # ======================
 
 @tool
-def get_weather_forecast(location: str, travel_dates: str) -> str:
+def get_weather(location: str, dates: str) -> str:
     """
-    Get weather forecast for destination using wttr.in.
+    Get weather forecast for destination.
     
     Args:
-        location: Destination city name (e.g., "Barcelona")
-        travel_dates: Travel date range (e.g., "October 15-19")
+        location: Destination city (e.g., "Barcelona")
+        dates: Travel dates (e.g., "October 15-19")
     
     Returns:
         Weather summary with temperature and packing advice
@@ -26,122 +25,54 @@ def get_weather_forecast(location: str, travel_dates: str) -> str:
     try:
         clean = re.sub(r'[^a-zA-Z0-9\s]', '', location).replace(' ', '+')
         data = requests.get(f"http://wttr.in/{clean}?format=j1", timeout=10).json()
-        cur = data['current_condition'][0]
-        temp = int(cur['temp_C'])
-        cond = cur['lang_en'][0]['value']
-        if temp > 20:
-            pack = "Light layers, sunscreen, hat"
-        else:
-            pack = "Warm layers, light jacket"
+        temp = int(data['current_condition'][0]['temp_C'])
+        cond = data['current_condition'][0]['lang_en'][0]['value']
+        advice = "light layers + jacket" if temp < 22 else "light clothing + sunscreen"
         if "rain" in cond.lower():
-            pack += " + umbrella"
-        return f"{location} weather: {temp}°C, {cond}. Packing: {pack}"
+            advice += " + umbrella"
+        return f"{location}: {temp}°C, {cond}. Pack: {advice}"
     except:
-        return f"{location} typical weather: 15-25°C. Pack light layers + light jacket + umbrella."
+        return f"{location}: Typical 18-24°C in Oct. Pack light layers + light jacket + umbrella."
 
 
 @tool
-def convert_currency(amount: float, from_currency: str, to_currency: str) -> str:
+def convert_currency(amount: float, from_curr: str, to_curr: str) -> str:
     """
     Convert currency using Frankfurter API.
     
     Args:
         amount: Amount to convert (e.g., 1200.0)
-        from_currency: Source currency code (e.g., "USD")
-        to_currency: Target currency code (e.g., "EUR")
+        from_curr: Source currency code (e.g., "USD")
+        to_curr: Target currency code (e.g., "EUR")
     
     Returns:
         Formatted conversion result
     """
     try:
-        from_currency = from_currency.upper()
-        to_currency = to_currency.upper()
-        if from_currency == to_currency:
-            return f"{amount:,.0f} {from_currency}"
+        from_curr = from_curr.upper()
+        to_curr = to_curr.upper()
+        if from_curr == to_curr:
+            return f"{amount:,.0f} {from_curr}"
         rate = requests.get(
-            f"https://api.frankfurter.app/latest?from={from_currency}&to={to_currency}", 
+            f"https://api.frankfurter.app/latest?from={from_curr}&to={to_curr}",
             timeout=10
-        ).json()['rates'][to_currency]
-        return f"{amount:,.0f} {from_currency} = {amount*rate:,.0f} {to_currency} (1 {from_currency} = {rate:.2f} {to_currency})"
+        ).json()['rates'][to_curr]
+        return f"{amount:,.0f} {from_curr} = {amount*rate:,.0f} {to_curr}"
     except:
-        return f"{amount:,.0f} {from_currency} (conversion unavailable)"
+        return f"{amount:,.0f} {from_curr} (≈{amount*0.93:,.0f} EUR est.)"
 
 
 @tool
-def generate_packing_list(destination: str, weather_summary: str, trip_days: int, trip_type: str) -> str:
+def build_catalogue(destination: str, origin: str, dates: str, budget: str, weather: str, image_url_1: str, image_url_2: str) -> str:
     """
-    Generate packing list based on weather and trip type.
-    
-    Args:
-        destination: Destination name (e.g., "Barcelona")
-        weather_summary: Weather conditions summary
-        trip_days: Number of travel days (e.g., 4)
-        trip_type: Trip type: "sightseeing", "beach", or "hiking"
-    
-    Returns:
-        Formatted packing checklist
-    """
-    cold = "cold" in weather_summary.lower() or "jacket" in weather_summary.lower()
-    rain = "rain" in weather_summary.lower() or "umbrella" in weather_summary.lower()
-    
-    tops = trip_days // 2 + 1
-    bottoms = trip_days // 3 + 1
-    
-    clothes = [f"• Tops ({tops})", f"• Bottoms ({bottoms})"]
-    if cold:
-        clothes += ["• Warm jacket", "• Beanie + gloves"]
-    else:
-        clothes += ["• Light jacket (essential)"]
-    if rain:
-        clothes += ["• Compact umbrella", "• Waterproof jacket"]
-    if trip_type == "beach":
-        clothes += ["• Swimsuit", "• Flip-flops"]
-    
-    return (
-        f"🎒 PACKING LIST ({trip_days}-day {trip_type})\n"
-        "ESSENTIALS\n• Passport + copies\n• Cards + small cash\n• Power adapter\n• Phone + charger\n\n"
-        "CLOTHING\n" + "\n".join(clothes) + "\n\n"
-        "TOILETRIES\n• Travel toiletries\n• Medications\n• First-aid kit"
-    )
-
-
-@tool
-def build_itinerary(destination: str, attractions: str, budget: float, days: int) -> str:
-    """
-    Create day-by-day itinerary.
-    
-    Args:
-        destination: Destination city (e.g., "Barcelona")
-        attractions: Comma-separated attractions list
-        budget: Total budget in local currency
-        days: Number of travel days
-    
-    Returns:
-        Formatted itinerary with daily schedule
-    """
-    atts = [a.strip() for a in attractions.split(",") if a.strip()] or ["Old Town", "Museum", "Viewpoint", "Market"]
-    daily = budget / max(days, 1)
-    lines = [f"🗓️ {days}-DAY ITINERARY: {destination}"]
-    for d in range(1, days+1):
-        am = atts[(d-1) % len(atts)]
-        pm = atts[d % len(atts)]
-        lines += [f"DAY {d}", f"  09:00 {am}", f"  14:00 {pm}", f"  💰 Daily budget: ~{daily:,.0f}"]
-    return "\n".join(lines)
-
-
-@tool
-def assemble_catalogue(destination: str, origin: str, dates: str, budget_str: str, weather: str, itinerary: str, packing: str, image_url_1: str, image_url_2: str) -> str:
-    """
-    Compile final travel catalogue with embedded images.
+    Assemble final travel catalogue with embedded images.
     
     Args:
         destination: Destination city (e.g., "Barcelona")
         origin: Home city (e.g., "New York")
         dates: Travel dates (e.g., "Oct 15-19")
-        budget_str: Budget conversion result
+        budget: Budget conversion result (e.g., "$1,200 = €1,116")
         weather: Weather forecast summary
-        itinerary: Day-by-day plan
-        packing: Packing list
         image_url_1: First generated image URL from image_generation_tool
         image_url_2: Second generated image URL from image_generation_tool
     
@@ -149,89 +80,72 @@ def assemble_catalogue(destination: str, origin: str, dates: str, budget_str: st
         Beautiful Markdown travel catalogue with embedded images
     """
     return f"""# 🌍 {destination} Travel Catalogue
-*From {origin} • {dates} • Budget: {budget_str}*
-
----
+*From {origin} • {dates} • Budget: {budget}*
 
 ## 🌤️ Weather
 {weather}
 
----
-
-## 🗓️ Itinerary
-{itinerary}
-
----
-
-## 🎒 Packing List
-{packing}
-
----
-
 ## 📸 Destination Views
 ![{destination} landmark]({image_url_1})
-*Generated view #1*
+*Generated landmark view*
 
 ![{destination} street scene]({image_url_2})
-*Generated view #2*
-
----
+*Generated street scene*
 
-> 💡 Book attractions online to skip lines. Use public transport passes for savings.
+> 💡 Pro Tip: Book Sagrada Familia tickets online to skip 2-hour queues!
 """
 
-
 # ======================
-# AGENT SETUP (IMAGE GENERATION FORCED)
+# AGENT SETUP (CRITICAL FIXES)
 # ======================
 
+# Load tools
 final_answer = FinalAnswerTool()
 web_search = DuckDuckGoSearchTool()
 image_gen = load_tool("agents-course/text-to-image", trust_remote_code=True)
 
+# Use minimal system prompt that encourages CODE BLOCKS (not prose)
+system_prompt = (
+    "You are a travel assistant. ALWAYS respond with executable Python code blocks.\n"
+    "Workflow:\n"
+    "1. Use DuckDuckGoSearchTool to find attractions\n"
+    "2. Use get_weather for forecast\n"
+    "3. Use convert_currency for budget\n"
+    "4. CALL image_generation_tool TWICE:\n"
+    "   img1 = image_generation_tool('{destination} landmark photorealistic')\n"
+    "   img2 = image_generation_tool('{destination} vibrant street scene')\n"
+    "5. Use build_catalogue with BOTH image URLs\n"
+    "NEVER output natural language steps. ONLY output:\n"
+    "Thoughts: ...\n"
+    "Code:\n"
+    "```py\n"
+    "# executable code\n"
+    "```"
+)
+
 model = HfApiModel(
-    max_tokens=2096,
-    temperature=0.3,  # Lower temp for more reliable tool usage
+    max_tokens=1500,  # Prevent token exhaustion
+    temperature=0.2,   # Lower = more deterministic code output
     model_id="Qwen/Qwen2.5-Coder-32B-Instruct",
 )
 
-# CRITICAL: System prompt that FORCES image generation steps
-prompt_templates = {
-    "system_prompt": (
-        "You are TravelCatalogueCreator. ALWAYS follow this EXACT workflow:\n"
-        "1. Use DuckDuckGoSearchTool to research destination attractions\n"
-        "2. Use get_weather_forecast for weather during travel dates\n"
-        "3. Use convert_currency to show budget in local currency\n"
-        "4. Use build_itinerary to create day-by-day plan\n"
-        "5. Use generate_packing_list for packing advice\n"
-        "6. CALL image_generation_tool EXACTLY TWICE with prompts:\n"
-        "   - First call: '{destination} landmark photorealistic travel photo'\n"
-        "   - Second call: '{destination} street scene vibrant travel photo'\n"
-        "7. Use assemble_catalogue with BOTH image URLs from step 6\n\n"
-        "NEVER skip image generation. NEVER call FinalAnswerTool directly. "
-        "You MUST complete all 7 steps before finishing."
-    )
-}
-
 agent = CodeAgent(
     model=model,
     tools=[
         final_answer,
         web_search,
-        image_gen,  # Must be available for step 6
-        get_weather_forecast,
+        image_gen,  # MUST be in tool list to be callable in code blocks
+        get_weather,
         convert_currency,
-        generate_packing_list,
-        build_itinerary,
-        assemble_catalogue,  # Requires real image URLs as inputs
+        build_catalogue,
     ],
-    max_steps=20,  # Allow room for 2 image generation steps
+    max_steps=12,
     verbosity_level=1,
-    name="TravelCatalogueCreator",
-    description="Creates beautiful travel catalogues with mandatory image generation",
-    prompt_templates=prompt_templates,
+    name="TravelAgent",
+    description="Creates travel catalogues with images",
+    prompt_templates={"system_prompt": system_prompt},
 )
 
 if __name__ == "__main__":
-    print("🚀 Travel Catalogue Creator with guaranteed image generation")
+    print("🚀 Travel Agent with guaranteed image generation")
     GradioUI(agent, file_upload_folder="./uploads").launch()