Update app.py

app.py

@@ -68,20 +68,14 @@ def get_air_quality(city: str, lang: str = "en") -> str:
                 "air_quality": "Air quality",
                 "pm2_5": "Fine particles (PM2.5)",
                 "pm10": "Coarse particles (PM10)",
-                "co": "Carbon monoxide (CO)",
-                "no2": "Nitrogen dioxide (NO2)",
-                "so2": "Sulfur dioxide (SO2)",
-                "o3": "Ozone (O3)"
+                "co": "Carbon monoxide (CO)"
             },
             "ru": {
                 "aqi_desc": {1: "Хорошее", 2: "Удовлетворительное", 3: "Среднее", 4: "Плохое", 5: "Очень плохое"},
                 "air_quality": "Качество воздуха",
                 "pm2_5": "Мелкие частицы (PM2.5)",
                 "pm10": "Крупные частицы (PM10)",
-                "co": "Угарный газ (CO)",
-                "no2": "Диоксид азота (NO2)",
-                "so2": "Диоксид серы (SO2)",
-                "o3": "Озон (O3)"
+                "co": "Угарный газ (CO)"
             }
         }
         lang = lang if lang in translations else "en"
@@ -92,10 +86,7 @@ def get_air_quality(city: str, lang: str = "en") -> str:
             f"😷 {t['air_quality']}: AQI {aqi} ({t['aqi_desc'].get(aqi, 'Unknown')}) {aqi_emoji}\n"
             f"{t['pm2_5']}: {components['pm2_5']} µg/m³\n"
             f"{t['pm10']}: {components['pm10']} µg/m³\n"
-            f"{t['co']}: {components['co']} µg/m³\n"
-            f"{t['no2']}: {components['no2']} µg/m³\n"
-            f"{t['so2']}: {components['so2']} µg/m³\n"
-            f"{t['o3']}: {components['o3']} µg/m³"
+            f"{t['co']}: {components['co']} µg/m³"
         )
     except Exception as e:
         return f"Error fetching air quality for '{city}': {str(e)}"
@@ -121,45 +112,48 @@ def get_weather(city: str, lang: str = "en") -> str:
         
         data = response.json()
         temp = data["main"]["temp"]
-        description = data["weather"][0]["description"]
-        weather_id = data["weather"][0]["id"]
+        weather = data["weather"][0]["main"]
+        humidity = data["main"]["humidity"]
 
         translations = {
             "en": {
-                "weather": "Weather in",
-                "clear": "Clear",
-                "clouds": "Cloudy",
-                "rain": "Rain",
-                "snow": "Snow",
-                "thunderstorm": "Thunderstorm",
-                "mist": "Mist"
+                "weather": "Weather",
+                "temp": "Temperature",
+                "humidity": "Humidity",
+                "conditions": {
+                    "Clear": "Clear ☀️",
+                    "Clouds": "Cloudy ☁️",
+                    "Rain": "Rain 🌧",
+                    "Snow": "Snow ❄️",
+                    "Thunderstorm": "Thunderstorm ⛈",
+                    "Drizzle": "Drizzle 🌦",
+                    "Mist": "Mist 🌫"
+                }
             },
             "ru": {
-                "weather": "Погода в",
-                "clear": "Ясно",
-                "clouds": "Облачно",
-                "rain": "Дождь",
-                "snow": "Снег",
-                "thunderstorm": "Гроза",
-                "mist": "Туман"
+                "weather": "Погода",
+                "temp": "Температура",
+                "humidity": "Влажность",
+                "conditions": {
+                    "Clear": "Ясно ☀️",
+                    "Clouds": "Облачно ☁️",
+                    "Rain": "Дождь 🌧",
+                    "Snow": "Снег ❄️",
+                    "Thunderstorm": "Гроза ⛈",
+                    "Drizzle": "Морось 🌦",
+                    "Mist": "Туман 🌫"
+                }
             }
         }
         lang = lang if lang in translations else "en"
         t = translations[lang]
+        condition = t["conditions"].get(weather, weather)
         
-        weather_emoji = {
-            "2": "⛈️",  # Thunderstorm
-            "3": "🌧️",  # Drizzle
-            "5": "🌧️",  # Rain
-            "6": "❄️",  # Snow
-            "7": "🌫️",  # Mist
-            "800": "☀️", # Clear
-            "8": "☁️"   # Clouds
-        }
-        emoji = weather_emoji.get(str(weather_id)[0], "🌤️") if weather_id != 800 else weather_emoji.get("800")
-        
-        desc_trans = t.get(description, description.capitalize())
-        return f"🌤️ {t['weather']} {city}: {temp}°C, {desc_trans} {emoji}"
+        return (
+            f"🌡️ {t['weather']}: {condition}\n"
+            f"{t['temp']}: {temp}°C\n"
+            f"{t['humidity']}: {humidity}%"
+        )
     except Exception as e:
         return f"Error fetching weather for '{city}': {str(e)}"
 
@@ -188,4 +182,99 @@ prompt_templates = {
         "final_answer('YOUR ANSWER HERE')\n"
         "```\n"
         "Do NOT include 'thoughts', 'code', explanations, or invalid dates. "
-        "If the city is not found or
+        "If the city is not found or query is unclear, return an error via final_answer(). "
+        "NEVER generate code without ```py``` block or with invalid syntax."
+    ),
+    "default": "Response: {{question}}",
+    "planning": {
+        "initial_plan": (
+            "Analyze query: {{question}}. If it contains a city, get time, air quality, and weather. "
+            "Return code:\n"
+            "```py\n"
+            "final_answer('YOUR ANSWER HERE')\n"
+            "```"
+        ),
+        "update_plan_pre_messages": (
+            "Review query: {{question}}. Adjust plan. Return code:\n"
+            "```py\n"
+            "final_answer('YOUR ANSWER HERE')\n"
+            "```"
+        ),
+        "update_plan_post_messages": (
+            "Review query: {{question}} and results. Adjust plan. Return code:\n"
+            "```py\n"
+            "final_answer('YOUR ANSWER HERE')\n"
+            "```"
+        ),
+    },
+    "managed_agent": {
+        "execute": (
+            "Execute task: {{question}}. If it contains a city or phrases like 'сколько времени', use tools. "
+            "Return code:\n"
+            "```py\n"
+            "from langdetect import detect\n"
+            "query = '{{question}}'.strip()\n"
+            "city = query.split(' в ')[-1].strip().title() if ' в ' in query else query.title()\n"
+            "lang = detect(query) if query else 'en'\n"
+            "timezone = get_timezone_by_city(city)\n"
+            "if timezone.startswith('Error'):\n"
+            "    final_answer(timezone)\n"
+            "else:\n"
+            "    time_result = get_current_time_in_timezone(timezone)\n"
+            "    air_result = get_air_quality(city, lang)\n"
+            "    weather_result = get_weather(city, lang)\n"
+            "    final_answer(f'🕒 Время в {city}: {time_result}\\n' + air_result + '\\n' + weather_result)\n"
+            "```"
+        ),
+        "report": (
+            "Summarize task: {{question}}. Return code:\n"
+            "```py\n"
+            "final_answer('YOUR ANSWER HERE')\n"
+            "```"
+        ),
+        "task": (
+            "Define task: {{question}}. Return code:\n"
+            "```py\n"
+            "final_answer('YOUR TASK DEFINITION HERE')\n"
+            "```"
+        ),
+    },
+    "final_answer": {
+        "pre_messages": (
+            "Prepare response for: {{question}}. Return code:\n"
+            "```py\n"
+            "final_answer('YOUR ANSWER HERE')\n"
+            "```"
+        ),
+        "template": "Final response: {{answer}}",
+        "post_messages": (
+            "Review response for: {{question}}. Return code:\n"
+            "```py\n"
+            "final_answer('YOUR ANSWER HERE')\n"
+            "```"
+        ),
+    },
+}
+
+agent = CodeAgent(
+    model=model,
+    tools=[final_answer, get_current_time_in_timezone, get_timezone_by_city, get_air_quality, get_weather],
+    max_steps=3,
+    verbosity_level=2,
+    prompt_templates=prompt_templates,
+)
+
+def process_input(user_input):
+    try:
+        response = agent.run(user_input)
+        return response if response else "Error: No response received from the agent."
+    except Exception as e:
+        return f"Error: {str(e)}"
+
+gr.Interface(
+    fn=process_input,
+    inputs="text",
+    outputs="text",
+    title="Helpful Assistant",
+    description="Hello! What city or town are you from? I can tell you the time, air quality, weather, and more!"
+).launch()