remove confusing fallback solar calculation

Author: logan-han

app.py

@@ -221,7 +221,7 @@ def get_weather_forecast():
             else:
                 capacity_kw = 0
             logger.info(f"Solar capacity for forecast: {capacity_kw} kW (panel={panel_kw}, inverter_config={inverter_kw}, inverter_api={api_inverter_kw})")
-            # Analyse forecast with solar predictions (uses forecast.solar if available, falls back to weather-based)
+            # Analyse forecast with solar predictions (uses forecast.solar if available)
             forecast = weather_analyser.analyse_forecast(
                 forecast,
                 panel_capacity_kw=capacity_kw if capacity_kw > 0 else None,
@@ -952,8 +952,8 @@ def get_weather():
                 "icon": day.get("icon"),
                 "temp_max": day.get("temp_max"),
                 "temp_min": day.get("temp_min"),
-                "cloud_cover": day.get("cloud_cover"),
-                "precipitation_probability": day.get("precipitation_probability"),
+                "cloud_cover": day.get("clouds"),  # Map from internal "clouds" key
+                "precipitation_probability": day.get("pop"),  # Map from internal "pop" key
                 "is_bad_weather": day.get("is_bad_weather", False),
                 "estimated_solar_kwh": day.get("estimated_solar_kwh"),
                 "solar_source": day.get("solar_source")

templates/index.html

@@ -1503,15 +1503,17 @@ <h2>Schedule Settings</h2>
                 const tempMax = day.temp_max !== null ? Math.round(day.temp_max) : '--';
 
                 const solarEstimate = day.estimated_solar_kwh ? `<div class="solar-estimate">☀️ ~${day.estimated_solar_kwh} kWh</div>` : '';
+                const cloudCover = day.cloud_cover !== null && day.cloud_cover !== undefined ? `${day.cloud_cover}%` : '--';
+                const precip = day.precipitation_probability;
                 forecastHtml += `
                     <div class="${classes.join(' ')}">
                         <div class="day-name">${dayName}</div>
                         <div class="day-date">${formatDate(day.date)}</div>
                         <div class="weather-icon">${icon}</div>
                         <div class="condition">${day.condition}</div>
                         <div class="temp">${tempMin}° / ${tempMax}°</div>
-                        <div class="clouds">☁️ ${day.clouds}%</div>
-                        ${day.pop > 0 ? `<div class="pop">💧 ${day.pop}%</div>` : ''}
+                        <div class="clouds">☁️ ${cloudCover}</div>
+                        ${precip !== null && precip > 0 ? `<div class="pop">💧 ${precip}%</div>` : ''}
                         ${solarEstimate}
                     </div>
                 `;

tests/test_weather_client.py

@@ -623,27 +623,24 @@ def test_analyse_forecast_uses_solar_client(self):
         assert result["daily"][0]["solar_source"] == "forecast.solar"
         assert result["daily"][1]["estimated_solar_kwh"] == 8.0
 
-    def test_analyse_forecast_falls_back_to_weather_estimate(self):
-        """Test that analyse_forecast falls back to weather estimate when solar client unavailable"""
+    def test_analyse_forecast_no_solar_client(self):
+        """Test that analyse_forecast sets None for solar when solar client unavailable"""
         forecast = {
             "success": True,
             "daily": [
                 {"date": "2023-12-22", "condition": "Clear", "clouds": 10, "pop": 5}
             ]
         }
 
-        # Create a mock weather client with hourly data
-        mock_weather_client = Mock()
-        mock_weather_client.estimate_solar_output_hourly.return_value = 20.0
-
         result = self.analyser.analyse_forecast(
             forecast,
-            panel_capacity_kw=5.0,
-            weather_client=mock_weather_client
+            panel_capacity_kw=5.0
         )
 
-        assert result["daily"][0]["estimated_solar_kwh"] == 20.0
-        assert result["daily"][0]["solar_source"] == "weather_estimate"
+        # Without solar_client, no solar prediction is available
+        assert result["daily"][0]["estimated_solar_kwh"] is None
+        assert result["daily"][0]["has_solar_prediction"] is False
+        assert result["daily"][0]["solar_source"] is None
 
 
 class TestWeatherClientAdditionalCoverage:

weather_client.py

@@ -631,8 +631,8 @@ def analyse_forecast(
 
         Args:
             forecast: Forecast data from weather client
-            panel_capacity_kw: Panel capacity for weather-based solar estimation
-            weather_client: WeatherClient instance for hourly solar calculations
+            panel_capacity_kw: Panel capacity (unused, kept for compatibility)
+            weather_client: WeatherClient instance (unused, kept for compatibility)
             solar_client: SolarForecastClient for accurate solar predictions
             min_solar_threshold: Minimum solar kWh to consider a "good" day
         """
@@ -642,17 +642,19 @@ def analyse_forecast(
         daily = forecast["daily"]
         bad_weather_days = []
 
-        # Try to get solar forecast from forecast.solar first
+        # Try to get solar forecast from forecast.solar
         solar_forecast = None
         if solar_client:
             solar_forecast = solar_client.get_forecast()
             if solar_forecast.get("success"):
                 logger.info("Using forecast.solar for solar predictions")
+            elif solar_forecast.get("is_temporary"):
+                logger.warning("forecast.solar temporarily unavailable (rate limited or timeout)")
 
         for day in daily:
             date_str = day.get("date", "")
 
-            # Priority 1: Use forecast.solar if available
+            # Use forecast.solar if available
             if solar_forecast and solar_forecast.get("success"):
                 for solar_day in solar_forecast.get("daily", []):
                     if solar_day["date"] == date_str:
@@ -663,27 +665,14 @@ def analyse_forecast(
                 else:
                     day["estimated_solar_kwh"] = None
                     day["has_solar_prediction"] = False
-
-            # Priority 2: Fall back to weather-based estimation
-            if not day.get("has_solar_prediction") and panel_capacity_kw and panel_capacity_kw > 0 and weather_client:
-                hourly_estimate = weather_client.estimate_solar_output_hourly(
-                    panel_capacity_kw,
-                    date_str
-                )
-
-                if hourly_estimate is not None:
-                    day["estimated_solar_kwh"] = hourly_estimate
-                    day["has_solar_prediction"] = True
-                    day["solar_source"] = "weather_estimate"
-                else:
-                    day["estimated_solar_kwh"] = None
-                    day["has_solar_prediction"] = False
-
-            if not day.get("has_solar_prediction"):
+                    day["solar_source"] = None
+            else:
+                # No API prediction available - don't fall back to weather estimate
                 day["estimated_solar_kwh"] = None
                 day["has_solar_prediction"] = False
+                day["solar_source"] = None
 
-            # Determine if bad weather based on solar prediction
+            # Determine if bad weather based on solar prediction or weather conditions
             if day.get("has_solar_prediction") and min_solar_threshold:
                 is_bad = day["estimated_solar_kwh"] < min_solar_threshold
             else: