Update app.py

app.py

@@ -10,125 +10,155 @@ import gradio as gr
 
 load_dotenv()
 
-def get_timezone_by_city(city: str) -> str:
-    """
-    Get timezone for a city.
-
-    Args:
-        city (str): City name.
+def geocode_city(city: str):
+    geolocator = Nominatim(user_agent="weather_assistant")
+    location = geolocator.geocode(city, language="en")
+    if not location:
+        simple = city.split()[0]
+        location = geolocator.geocode(simple, language="en")
+    return location
 
-    Returns:
-        str: Timezone or error message.
-    """
-    try:
-        geolocator = Nominatim(user_agent="simple_bot")
-        loc = geolocator.geocode(city, language="en")
-        if not loc:
-            return f"❌ Город '{city}' не найден."
-        tz = TimezoneFinder().timezone_at(lat=loc.latitude, lng=loc.longitude)
-        return tz or f"❌ Часовой пояс не найден."
-    except Exception as e:
-        return f"❌ Ошибка пояса: {e}"
+def get_timezone_by_city(city: str) -> str:
+    location = geocode_city(city)
+    if not location:
+        return f"❌ Не удалось найти населенный пункт '{city}'."
+    tz = TimezoneFinder().timezone_at(lat=location.latitude, lng=location.longitude)
+    if not tz:
+        return f"❌ Не удалось определить часовой пояс для '{city}'."
+    return tz
 
 def get_current_time_in_timezone(timezone: str) -> str:
-    """
-    Get local time for timezone.
-
-    Args:
-        timezone (str): Timezone name.
-
-    Returns:
-        str: Current time or error.
-    """
     try:
         now = datetime.datetime.now(pytz.timezone(timezone))
         return now.strftime("%Y-%m-%d %H:%M:%S")
     except Exception as e:
-        return f"❌ Ошибка времени: {e}"
+        return f"❌ Ошибка получения времени: {e}"
 
 def get_air_quality(city: str, lang: str = "en") -> str:
-    """
-    Air quality in city with translation.
-
-    Args:
-        city (str): City name.
-        lang (str): Language code.
-
-    Returns:
-        str: AQI info.
-    """
-    try:
-        loc = Nominatim(user_agent="simple_bot").geocode(city, language="en")
-        if not loc:
-            return f"❌ Город '{city}' не найден."
-        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"{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"❌ Ошибка воздуха: {e}"
+    location = geocode_city(city)
+    if not location:
+        return f"❌ Не удалось найти населенный пункт '{city}'."
+    api_key = os.environ.get("OPENWEATHERMAP_API_KEY")
+    if not api_key:
+        return "❌ Отсутствует API-ключ OpenWeatherMap."
+    url = (f"http://api.openweathermap.org/data/2.5/air_pollution?"
+           f"lat={location.latitude}&lon={location.longitude}&appid={api_key}")
+    resp = requests.get(url)
+    if resp.status_code != 200:
+        return f"❌ Ошибка API качества воздуха: {resp.status_code}"
+    data = resp.json().get("list", [])
+    if not data:
+        return "❌ Нет данных о качестве воздуха."
+    aqi = data[0]["main"]["aqi"]
+    comps = data[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 "☣️"
+    return (
+        f"{t['title']}: AQI {aqi} ({t['aqi_desc'][aqi]}) {emoji}\n"
+        f"{t['pm2_5']}: {comps['pm2_5']} µg/m³\n"
+        f"{t['pm10']}: {comps['pm10']} µg/m³\n"
+        f"{t['co']}: {comps['co']} µg/m³"
+    )
 
 def get_weather(city: str, lang: str = "en") -> str:
-    """
-    Weather in city with translation.
-
-    Args:
-        city (str): City name.
-        lang (str): Language code.
-
-    Returns:
-        str: Weather info.
-    """
-    try:
-        loc = Nominatim(user_agent="simple_bot").geocode(city, language="en")
-        if not loc:
-            return f"❌ Город '{city}' не найден."
-        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"❌ Ошибка погоды: {e}"
+    location = geocode_city(city)
+    if not location:
+        return f"❌ Не удалось найти населенный пункт '{city}'."
+    api_key = os.environ.get("OPENWEATHERMAP_API_KEY")
+    if not api_key:
+        return "❌ Отсутствует API-ключ OpenWeatherMap."
+    url = (f"http://api.openweathermap.org/data/2.5/weather?"
+           f"lat={location.latitude}&lon={location.longitude}"
+           f"&appid={api_key}&units=metric")
+    resp = requests.get(url)
+    if resp.status_code != 200:
+        return f"❌ Ошибка API погоды: {resp.status_code}"
+    d = resp.json()
+    cond = d["weather"][0]["main"]
+    temp = d["main"]["temp"]
+    hum = d["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(cond, cond)
+    return (
+        f"{t['title']}: {desc}\n"
+        f"{t['temp']}: {temp}°C\n"
+        f"{t['humidity']}: {hum}%"
+    )
 
 def process_input(user_input: str) -> str:
     lang = detect(user_input)
-    lang = lang if lang in ["en","ru","hi"] else "en"
+    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
+    if tz.startswith("❌"):
+        return tz
+    ct = get_current_time_in_timezone(tz)
+    if ct.startswith("❌"):
+        return ct
     aq = get_air_quality(city, lang)
-    w  = get_weather(city, lang)
-    # Собираем итог
-    parts = [f"🕒 Время: {ct}", aq, w]
-    return "\n\n".join(parts)
+    w = get_weather(city, lang)
+    return f"🕒 {'Time' if lang=='en' else 'Время'}: {ct}\n\n{aq}\n\n{w}"
 
 if __name__ == "__main__":
     gr.Interface(
         fn=process_input,
         inputs="text",
         outputs="text",
-        title="🌍 Городской ассистент",
-        description="Введи город — получишь время, AQI и погоду.",
+        title="Weather Assistant / Погодный ассистент",
+        description="Введите свой населенный пункт — получите время, погоду и качество воздуха."
     ).launch()