Update so gradio calls forecast function, not ui. Eliminate ui function

app.py

@@ -20,16 +20,16 @@ WEATHER_CODES = {
 
 def get_weather_forecast_range(location_name, start_date, end_date):
     """
-    Fetches weather forecast data for a specified location and date range using the Open-Meteo API.
+    Fetches weather forecast for a given location and date range, returns a Markdown summary.
+    Also saves the forecast as a JSON file under the 'logs' directory.
 
     Parameters:
         location_name (str): Name of the location (e.g., city or landmark).\n
-        start_date (str or date): Start date of the forecast range in "YYYY-MM-DD" format or as a `date` object.\n
-        end_date (str or date): End date of the forecast range in "YYYY-MM-DD" format or as a `date` object.\n
+        start_date (str or date): Start date of the forecast in 'YYYY-MM-DD' format or as a date object.\n
+        end_date (str or date): End date of the forecast in 'YYYY-MM-DD' format or as a date object.\n
 
     Returns:
-        list[dict] or dict: A list of daily forecast dictionaries with optional hourly data,
-                            or a dictionary with an "error" key if the process fails.\n
+        str: Markdown-formatted string with weather details or an error message.\n
     """
     try:
         if isinstance(start_date, str):
@@ -41,12 +41,12 @@ def get_weather_forecast_range(location_name, start_date, end_date):
         days_ahead = (end_date - today).days
 
         if days_ahead > 15:
-            return {"error": "Weather data only available up to 15 days from today."}
+            return f"**⚠️ Error:** Weather data only available up to 15 days from today."
 
         geolocator = Nominatim(user_agent="weather_api")
         location = geolocator.geocode(location_name)
         if not location:
-            return {"error": f"Could not find coordinates for '{location_name}'."}
+            return f"**⚠️ Error:** Could not find coordinates for '{location_name}'."
         lat, lon = location.latitude, location.longitude
 
         include_hourly = days_ahead <= 6
@@ -69,7 +69,7 @@ def get_weather_forecast_range(location_name, start_date, end_date):
 
         response = requests.get(url, params=params)
         if response.status_code != 200:
-            return {"error": f"API error {response.status_code}: {response.text}"}
+            return f"**⚠️ Error:** API error {response.status_code}: {response.text}"
         raw = response.json()
 
         forecasts = []
@@ -117,54 +117,35 @@ def get_weather_forecast_range(location_name, start_date, end_date):
 
             forecasts.append(day_result)
 
-        return forecasts
-    
-    except Exception as e:
-        return {"error": str(e)}
-
-def get_weather_forecast_range_ui(location_name, start_date, end_date):
-    """
-    Wrapper function to fetch weather forecast and generate a Markdown summary. Also saves the forecast data as JSON.
-
-    Parameters:
-        location_name (str): Name of the location (e.g., city or landmark).\n
-        start_date (str): Forecast start date in "YYYY-MM-DD" format.\n
-        end_date (str): Forecast end date in "YYYY-MM-DD" format.\n
+        # Save the forecast JSON
+        save_dir = Path("logs")
+        save_dir.mkdir(exist_ok=True)
+        save_path = save_dir / f"weather_{location_name}_{start_date}_to_{end_date}.json"
+        with open(save_path, "w", encoding="utf-8") as f:
+            json.dump(forecasts, f, indent=2)
+
+        # Generate Markdown output
+        md = f"## Weather Forecast for {location_name}\n\n"
+        for day in forecasts:
+            md += f"### 📅 {day['date']}\n"
+            md += f"- 🌅 Sunrise: {day['sunrise']}\n"
+            md += f"- 🌇 Sunset: {day['sunset']}\n"
+            md += f"- 🌡️ Temp: {day['temp_min']}°C – {day['temp_max']}°C\n"
+            md += f"- 🌤️ Weather: {day['weather']}\n"
+            md += f"- ☀️ UV Index Max: {day['uv_max']}\n"
+
+            if "hourly" in day:
+                md += f"**Hourly Forecast:**\n"
+                for h in day["hourly"]:
+                    md += f"  - {h['time']}: {h['temp']}, {h['weather']}, UV {h['uv']}, Visibility {h['visibility']}\n"
+            elif "note" in day:
+                md += f"_{day['note']}_\n"
+            md += "\n"
+
+        return md
 
-    Returns:
-        str: A Markdown-formatted string summarizing the weather forecast or an error message.\n
-    """
-    result = get_weather_forecast_range(location_name, start_date, end_date)
-
-    if "error" in result:
-        return f"**⚠️ Error:** {result['error']}"
-
-    # Save JSON silently
-    save_dir = Path("logs")
-    save_dir.mkdir(exist_ok=True)
-    save_path = save_dir / f"weather_{location_name}_{start_date}_to_{end_date}.json"
-    with open(save_path, "w", encoding="utf-8") as f:
-        json.dump(result, f, indent=2)
-
-    # Generate Markdown summary
-    md = f"## Weather Forecast for {location_name}\n\n"
-    for day in result:
-        md += f"### 📅 {day['date']}\n"
-        md += f"- 🌅 Sunrise: {day['sunrise']}\n"
-        md += f"- 🌇 Sunset: {day['sunset']}\n"
-        md += f"- 🌡️ Temp: {day['temp_min']}°C – {day['temp_max']}°C\n"
-        md += f"- 🌤️ Weather: {day['weather']}\n"
-        md += f"- ☀️ UV Index Max: {day['uv_max']}\n"
-
-        if "hourly" in day:
-            md += f"**Hourly Forecast:**\n"
-            for h in day["hourly"]:
-                md += f"  - {h['time']}: {h['temp']}, {h['weather']}, UV {h['uv']}, Visibility {h['visibility']}\n"
-        elif "note" in day:
-            md += f"_{day['note']}_\n"
-        md += "\n"
-
-    return md
+    except Exception as e:
+        return f"**⚠️ Error:** {str(e)}"
 
 with gr.Blocks(title="TravAI Weather Forecast", theme=gr.themes.Soft(primary_hue="indigo")) as demo:
     gr.Markdown("""
@@ -182,7 +163,7 @@ with gr.Blocks(title="TravAI Weather Forecast", theme=gr.themes.Soft(primary_hue
     
     output = gr.Markdown(label="📜 Forecast Output")
 
-    submit_btn.click(fn=get_weather_forecast_range_ui,
+    submit_btn.click(fn=get_weather_forecast_range,
                      inputs=[location, start, end],
                      outputs=output)