Update app.py

app.py

@@ -4,64 +4,82 @@ import requests
 def get_time_and_weather(city: str, country: str) -> dict:
     """
     Returns the current time and weather for the specified city and country.
-
-    Args:
-        city (str): Name of the city (e.g., 'Berlin')
-        country (str): Name of the country (e.g., 'Germany')
-
-    Returns:
-        dict: A dictionary containing current time and weather conditions.
     """
     try:
-        # 1. Get lat/lon from Nominatim (OpenStreetMap)
-        geocode = requests.get("https://nominatim.openstreetmap.org/search", params={
-            "q": f"{city}, {country}",
+        
+        # 1. Get lat/lon from Open-Meteo's Geocoding API (no key required!)
+        geo_res = requests.get("https://geocoding-api.open-meteo.com/v1/search", params={
+            "name": city,
+            "count": 1,
+            "language": "en",
             "format": "json"
-        }).json()
+        })
 
-        if not geocode:
-            return {"error": f"Could not find location: {city}, {country}"}
+        if geo_res.status_code != 200:
+            return {"error": f"Geolocation failed. Status: {geo_res.status_code}"}
 
-        lat = geocode[0]["lat"]
-        lon = geocode[0]["lon"]
+        geo_data = geo_res.json()
+        results = geo_data.get("results", [])
+
+        if not results:
+            return {"error": f"Could not find location: {city}, {country}"}
 
+        lat = results[0]["latitude"]
+        lon = results[0]["longitude"]
+        timezone = results[0]["timezone"]
+ 
+        print(f"Location: {city}, {country}")
+        print(f"Latitude: {lat}, Longitude: {lon}")
+        print(f"Timezone: {timezone}")
         # 2. Get weather from Open-Meteo
-        weather = requests.get("https://api.open-meteo.com/v1/forecast", params={
+        weather_url = "https://api.open-meteo.com/v1/forecast"
+        weather_res = requests.get(weather_url, params={
             "latitude": lat,
             "longitude": lon,
-            "current": "temperature_2m,weathercode",
-        }).json()
+            "current": "temperature_2m,weathercode"
+        })
 
-        current_weather = weather.get("current", {})
+        if weather_res.status_code != 200:
+            return {"error": f"Weather API failed. Status: {weather_res.status_code}"}
+
+        weather_data = weather_res.json()
+        current_weather = weather_data.get("current", {})
         temperature = current_weather.get("temperature_2m", "N/A")
         weather_code = current_weather.get("weathercode", "N/A")
 
-        # 3. Get time from WorldTimeAPI
-        time_data = requests.get(f"http://worldtimeapi.org/api/timezone").json()
-        timezone_url = f"http://worldtimeapi.org/api/timezone"
+        # 3. Get timezone from lat/lon using TimeZoneDB (no key alternative)
+       # timezone_res = requests.get("http://worldtimeapi.org/api/timezone")
+
+        #if timezone_res.status_code != 200:
+        #    return {"error": f"Timezone list fetch failed. Status: {timezone_res.status_code}"}
+
+        #all_timezones = timezone_res.json()
+        #match = next((tz for tz in all_timezones if city.lower() in tz.lower()), None)
+
+        #if not match:
+        #    match = next((tz for tz in all_timezones if country.lower() in tz.lower()), None)
+
+        #if not match:
+        #    return {"error": f"No matching timezone found for {city}, {country}"}
 
-        # Best effort: Try to find closest matching timezone
-        tz_list = time_data if isinstance(time_data, list) else []
-        location_part = city.replace(" ", "_")
-        match = next((tz for tz in tz_list if location_part.lower() in tz.lower()), None)
+        #time_detail_res = requests.get(f"http://worldtimeapi.org/api/timezone/{match}")
+        #if time_detail_res.status_code != 200:
+        #    return {"error": f"Time fetch failed for zone: {match}"}
 
-        if match:
-            time_result = requests.get(f"http://worldtimeapi.org/api/timezone/{match}").json()
-            datetime = time_result.get("datetime", "N/A")
-        else:
-            datetime = "Could not determine timezone"
+        #time_data = time_detail_res.json()
+        #datetime = time_data.get("datetime", "N/A")
 
         return {
             "location": f"{city}, {country}",
-            "local_time": datetime,
+            "timezone": "n/a",
+            "local_time": "n/a",
             "temperature (°C)": temperature,
             "weather_code": weather_code
         }
 
     except Exception as e:
-        return {"error": str(e)}
+        return {"error": f"{type(e).__name__}: {str(e)}"}
 
-# Gradio interface
 iface = gr.Interface(
     fn=get_time_and_weather,
     inputs=[gr.Textbox(label="City", value="Berlin"), gr.Textbox(label="Country", value="Germany")],