Update app.py

app.py

@@ -1,17 +1,15 @@
 import os
-from dotenv import load_dotenv
-load_dotenv()
-
-from smolagents import CodeAgent, HfApiModel, tool
 import datetime
 import pytz
-import gradio as gr
-from geopy.geocoders import Nominatim
-from timezonefinder import TimezoneFinder
 import requests
+from dotenv import load_dotenv
 from langdetect import detect
+from geopy.geocoders import Nominatim
+from timezonefinder import TimezoneFinder
+import gradio as gr
+
+load_dotenv()
 
-@tool
 def get_timezone_by_city(city: str) -> str:
     """
     Get timezone for a city.
@@ -20,240 +18,117 @@ def get_timezone_by_city(city: str) -> str:
         city (str): City name.
 
     Returns:
-        str: Timezone name or error.
+        str: Timezone or error message.
     """
     try:
-        geolocator = Nominatim(user_agent="smolagents_bot")
-        location = geolocator.geocode(city, language="en")
-        if not location:
+        geolocator = Nominatim(user_agent="simple_bot")
+        loc = geolocator.geocode(city, language="en")
+        if not loc:
             return f"❌ Город '{city}' не найден."
-        tf = TimezoneFinder()
-        timezone = tf.timezone_at(lat=location.latitude, lng=location.longitude)
-        return timezone or f"❌ Часовой пояс не определён."
+        tz = TimezoneFinder().timezone_at(lat=loc.latitude, lng=loc.longitude)
+        return tz or f"❌ Часовой пояс не найден."
     except Exception as e:
-        return f"❌ Ошибка определения пояса: {str(e)}"
+        return f"❌ Ошибка пояса: {e}"
 
-@tool
 def get_current_time_in_timezone(timezone: str) -> str:
     """
-    Get current time in given timezone.
+    Get local time for timezone.
 
     Args:
         timezone (str): Timezone name.
 
     Returns:
-        str: Local time or error.
+        str: Current time or error.
     """
     try:
-        tz = pytz.timezone(timezone)
-        return datetime.datetime.now(tz).strftime("%Y-%m-%d %H:%M:%S")
+        now = datetime.datetime.now(pytz.timezone(timezone))
+        return now.strftime("%Y-%m-%d %H:%M:%S")
     except Exception as e:
-        return f"❌ Ошибка времени: {str(e)}"
+        return f"❌ Ошибка времени: {e}"
 
-@tool
 def get_air_quality(city: str, lang: str = "en") -> str:
     """
-    Air quality in city with translations.
+    Air quality in city with translation.
 
     Args:
         city (str): City name.
         lang (str): Language code.
 
     Returns:
-        str: Translated air quality info.
+        str: AQI info.
     """
     try:
-        geolocator = Nominatim(user_agent="smolagents_bot")
-        location = geolocator.geocode(city, language="en")
-        if not location:
+        loc = Nominatim(user_agent="simple_bot").geocode(city, language="en")
+        if not loc:
             return f"❌ Город '{city}' не найден."
-
-        api_key = os.environ["OPENWEATHERMAP_API_KEY"]
-        url = f"http://api.openweathermap.org/data/2.5/air_pollution?lat={location.latitude}&lon={location.longitude}&appid={api_key}"
-        response = requests.get(url)
-        if response.status_code != 200:
-            return f"❌ Ошибка API: {response.status_code}"
-
-        data = response.json()
-        aqi = data["list"][0]["main"]["aqi"]
-        c = data["list"][0]["components"]
-
-        translations = {
-            "en": {
-                "title": "😷 Air Quality",
-                "aqi_desc": {1: "Good", 2: "Fair", 3: "Moderate", 4: "Poor", 5: "Very Poor"},
-                "pm2_5": "Fine particles (PM2.5)",
-                "pm10": "Coarse particles (PM10)",
-                "co": "Carbon monoxide (CO)"
-            },
-            "ru": {
-                "title": "😷 Качество воздуха",
-                "aqi_desc": {1: "Хорошее", 2: "Удовлетворительное", 3: "Среднее", 4: "Плохое", 5: "Очень плохое"},
-                "pm2_5": "Мелкодисперсные частицы (PM2.5)",
-                "pm10": "Крупнодисперсные частицы (PM10)",
-                "co": "Угарный газ (CO)"
-            },
-            "hi": {
-                "title": "😷 वायु गुणवत्ता",
-                "aqi_desc": {1: "अच्छा", 2: "संतोषजनक", 3: "मध्यम", 4: "खराब", 5: "बहुत खराब"},
-                "pm2_5": "सूक्ष्म कण (PM2.5)",
-                "pm10": "मोटे कण (PM10)",
-                "co": "कार्बन मोनोऑक्साइड (CO)"
-            }
-        }
-
-        t = translations.get(lang, translations["en"])
-        emoji = "🌱" if aqi <= 2 else "😷" if aqi <= 4 else "☣️"
-
+        key = os.environ["OPENWEATHERMAP_API_KEY"]
+        url = f"http://api.openweathermap.org/data/2.5/air_pollution?lat={loc.latitude}&lon={loc.longitude}&appid={key}"
+        data = requests.get(url).json()["list"][0]
+        aqi = data["main"]["aqi"]; c = data["components"]
+        tr = {
+            "en": ("😷 Air Quality", {1:"Good",2:"Fair",3:"Moderate",4:"Poor",5:"Very Poor"}),
+            "ru": ("😷 Качество воздуха", {1:"Хорошее",2:"Удовлетворительное",3:"Среднее",4:"Плохое",5:"Очень плохое"}),
+            "hi": ("😷 वायु गुणवत्ता", {1:"अच्छा",2:"संतोषजनक",3:"मध्यम",4:"खराब",5:"बहुत खराब"}),
+        }[lang if lang in ["en","ru","hi"] else "en"]
+        title, desc_map = tr
+        emoji = "🌱" if aqi<=2 else "😷" if aqi<=4 else "☣️"
         return (
-            f"{t['title']}: AQI {aqi} ({t['aqi_desc'][aqi]}) {emoji}\n"
-            f"{t['pm2_5']}: {c['pm2_5']} µg/m³\n"
-            f"{t['pm10']}: {c['pm10']} µg/m³\n"
-            f"{t['co']}: {c['co']} µg/m³"
+            f"{title}: AQI {aqi} ({desc_map[aqi]}) {emoji}\n"
+            f"PM2.5: {c['pm2_5']} µg/m³  PM10: {c['pm10']} µg/m³  CO: {c['co']} µg/m³"
         )
     except Exception as e:
-        return f"❌ Ошибка качества воздуха: {str(e)}"
+        return f"❌ Ошибка воздуха: {e}"
 
-@tool
 def get_weather(city: str, lang: str = "en") -> str:
     """
-    Weather info for a city with translations.
+    Weather in city with translation.
 
     Args:
         city (str): City name.
         lang (str): Language code.
 
     Returns:
-        str: Weather info string.
+        str: Weather info.
     """
     try:
-        geolocator = Nominatim(user_agent="smolagents_bot")
-        location = geolocator.geocode(city, language="en")
-        if not location:
+        loc = Nominatim(user_agent="simple_bot").geocode(city, language="en")
+        if not loc:
             return f"❌ Город '{city}' не найден."
-
-        api_key = os.environ["OPENWEATHERMAP_API_KEY"]
-        url = f"http://api.openweathermap.org/data/2.5/weather?lat={location.latitude}&lon={location.longitude}&appid={api_key}&units=metric"
-        response = requests.get(url)
-        if response.status_code != 200:
-            return f"❌ Ошибка API: {response.status_code}"
-
-        data = response.json()
-        condition = data["weather"][0]["main"]
-        temp = data["main"]["temp"]
-        humidity = data["main"]["humidity"]
-
-        translations = {
-            "en": {
-                "title": "🌡️ Weather",
-                "temp": "Temperature",
-                "humidity": "Humidity",
-                "conditions": {
-                    "Clear": "Clear ☀️", "Clouds": "Cloudy ☁️", "Rain": "Rain 🌧",
-                    "Snow": "Snow ❄️", "Thunderstorm": "Storm ⛈", "Drizzle": "Drizzle 🌦", "Mist": "Mist 🌫", "Haze": "Haze 🌫"
-                }
-            },
-            "ru": {
-                "title": "🌡️ Погода",
-                "temp": "Температура",
-                "humidity": "Влажность",
-                "conditions": {
-                    "Clear": "Ясно ☀️", "Clouds": "Облачно ☁️", "Rain": "Дождь 🌧",
-                    "Snow": "Снег ❄️", "Thunderstorm": "Гроза ⛈", "Drizzle": "Морось 🌦", "Mist": "Туман 🌫", "Haze": "Дымка 🌫"
-                }
-            },
-            "hi": {
-                "title": "🌡️ मौसम",
-                "temp": "तापमान",
-                "humidity": "नमी",
-                "conditions": {
-                    "Clear": "साफ ☀️", "Clouds": "बादल ☁️", "Rain": "बारिश 🌧",
-                    "Snow": "बर्फ ❄️", "Thunderstorm": "तूफान ⛈", "Drizzle": "बूंदाबांदी 🌦", "Mist": "कोहरा 🌫", "Haze": "धुंध 🌫"
-                }
-            }
-        }
-
-        t = translations.get(lang, translations["en"])
-        desc = t["conditions"].get(condition, condition)
-
-        return (
-            f"{t['title']}: {desc}\n"
-            f"{t['temp']}: {temp}°C\n"
-            f"{t['humidity']}: {humidity}%"
-        )
-    except Exception as e:
-        return f"❌ Ошибка погоды: {str(e)}"
-
-@tool
-def final_answer(answer: str) -> str:
-    """
-    Return final response.
-
-    Args:
-        answer (str): The output.
-
-    Returns:
-        str: Same as input.
-    """
-    return answer
-
-model = HfApiModel(
-    max_tokens=1000,
-    temperature=0.5,
-    model_id='mistralai/Mixtral-8x7B-Instruct-v0.1',
-)
-
-system_prompt = (
-    "Ты полезный ассистент. Используй только функции: "
-    "`get_timezone_by_city`, `get_current_time_in_timezone`, `get_air_quality`, `get_weather`, `final_answer`. "
-    "В начале всегда указывай: `lang = variables['lang']` и передавай его в функции. "
-    "Ответ должен быть только на языке пользователя. В��звращай только код внутри блока:\n"
-    "```py\nfinal_answer('...')\n```<end_code>\n"
-    "❌ Никаких пояснений, комментариев, JSON, markdown, описаний вне кода."
-)
-
-prompt_templates = {
-    "system_prompt": system_prompt,
-    "default": "Response: {{question}}",
-    "managed_agent": {
-        "execute": "```py\nfinal_answer('...')\n```",
-        "report": "```py\nfinal_answer('Not implemented')\n```",
-        "task": "```py\nfinal_answer('Not implemented')\n```"
-    },
-    "planning": {
-        "initial_plan": "```py\nfinal_answer('Plan not needed')\n```",
-        "update_plan_pre_messages": "```py\nfinal_answer('Plan updated')\n```",
-        "update_plan_post_messages": "```py\nfinal_answer('Plan adjusted')\n```"
-    },
-    "final_answer": {
-        "pre_messages": "```py\nfinal_answer('...')\n```",
-        "template": "Final response: {{answer}}",
-        "post_messages": "```py\nfinal_answer('...')\n```"
-    }
-}
-
-agent = CodeAgent(
-    model=model,
-    tools=[get_timezone_by_city, get_current_time_in_timezone, get_air_quality, get_weather, final_answer],
-    prompt_templates=prompt_templates,
-    max_steps=3,
-    verbosity_level=2,
-)
-
-def process_input(user_input):
-    try:
-        lang = detect(user_input)
-        lang = lang if lang in ["en", "ru", "hi"] else "en"
-        agent.variables = {"lang": lang}
-        return agent.run(user_input) or "❌ Нет ответа от агента."
+        key = os.environ["OPENWEATHERMAP_API_KEY"]
+        url = f"http://api.openweathermap.org/data/2.5/weather?lat={loc.latitude}&lon={loc.longitude}&appid={key}&units=metric"
+        d = requests.get(url).json()
+        w = d["weather"][0]["main"]; t = d["main"]["temp"]; h = d["main"]["humidity"]
+        cfg = {
+            "en": ("🌡️ Weather", "Temperature", "Humidity",
+                   {"Clear":"Clear ☀️","Clouds":"Cloudy ☁️","Rain":"Rain 🌧","Snow":"Snow ❄️","Thunderstorm":"Storm ⛈","Drizzle":"Drizzle 🌦","Mist":"Mist 🌫","Haze":"Haze 🌫"}),
+            "ru": ("🌡️ Погода", "Температура", "Влажность",
+                   {"Clear":"Ясно ☀️","Clouds":"Облачно ☁️","Rain":"Дождь 🌧","Snow":"Снег ❄️","Thunderstorm":"Гроза ⛈","Drizzle":"Морось 🌦","Mist":"Туман 🌫","Haze":"Дымка 🌫"}),
+            "hi": ("🌡️ मौसम","तापमान","नमी",
+                   {"Clear":"साफ ☀️","Clouds":"बादल ☁️","Rain":"बारिश 🌧","Snow":"बर्फ ❄️","Thunderstorm":"तूफान ⛈","Drizzle":"बूंदाबांदी 🌦","Mist":"कोहरा 🌫","Haze":"धुंध 🌫"}),
+        }[lang if lang in ["en","ru","hi"] else "en"]
+        title, ltemp, lhum, conds = cfg
+        desc = conds.get(w, w)
+        return f"{title}: {desc}\n{ltemp}: {t}°C  {lhum}: {h}%"
     except Exception as e:
-        return f"❌ Ошибка: {str(e)}"
+        return f"❌ Ошибка погоды: {e}"
+
+def process_input(user_input: str) -> str:
+    lang = detect(user_input)
+    lang = lang if lang in ["en","ru","hi"] else "en"
+    city = user_input.strip()
+    tz = get_timezone_by_city(city)
+    ct = get_current_time_in_timezone(tz) if not tz.startswith("❌") else tz
+    aq = get_air_quality(city, lang)
+    w  = get_weather(city, lang)
+    # Собираем итог
+    parts = [f"🕒 Время: {ct}", aq, w]
+    return "\n\n".join(parts)
 
 if __name__ == "__main__":
     gr.Interface(
         fn=process_input,
         inputs="text",
         outputs="text",
-        title="🦊 Помощник по городу",
-        description="Напиши город, и я покажу тебе время, воздух и погоду"
-    ).launch() 
+        title="🌍 Городской ассистент",
+        description="Введи город — получишь время, AQI и погоду.",
+    ).launch()