From a611cb8ed90d7553d151903e37aaa9e064f64d87 Mon Sep 17 00:00:00 2001
From: Filip Lajszczak <filip@lajszczak.dev>
Date: Sun, 26 Jul 2026 18:33:55 +0000
Subject: [PATCH] forecast.solar: use cached data after network failures

---
 src/batcontrol/forecastsolar/fcsolar.py       |  7 ++-
 .../batcontrol/forecastsolar/test_fcsolar.py  | 60 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 tests/batcontrol/forecastsolar/test_fcsolar.py

diff --git a/src/batcontrol/forecastsolar/fcsolar.py b/src/batcontrol/forecastsolar/fcsolar.py
index 3cb7dadb..ca7fc53a 100644
--- a/src/batcontrol/forecastsolar/fcsolar.py
+++ b/src/batcontrol/forecastsolar/fcsolar.py
@@ -113,7 +113,12 @@ def get_raw_data_from_provider(self, pvinstallation_name) -> dict:
         logger.info(
             'Requesting Information for PV Installation %s', name)
 
-        response = requests.get(url, timeout=60)
+        try:
+            response = requests.get(url, timeout=60)
+        except requests.exceptions.RequestException:
+            raise ProviderError(
+                'Forecast solar API request failed'
+            ) from None
         if response.status_code == 200:
             return json.loads(response.text)
         elif response.status_code == 429:
diff --git a/tests/batcontrol/forecastsolar/test_fcsolar.py b/tests/batcontrol/forecastsolar/test_fcsolar.py
new file mode 100644
index 00000000..04bd3429
--- /dev/null
+++ b/tests/batcontrol/forecastsolar/test_fcsolar.py
@@ -0,0 +1,60 @@
+"""Tests for the forecast.solar provider."""
+
+import traceback
+
+import pytest
+import pytz
+import requests
+
+from batcontrol.forecastsolar.baseclass import ProviderError
+from batcontrol.forecastsolar.fcsolar import FCSolar
+
+
+@pytest.fixture
+def instance():
+    """Create a forecast.solar provider with one PV installation."""
+    return FCSolar(
+        [{
+            'name': 'roof',
+            'lat': 52.17,
+            'lon': 21.25,
+            'declination': 30,
+            'azimuth': 34,
+            'kWp': 10.0,
+        }],
+        pytz.timezone('Europe/Warsaw'),
+        min_time_between_api_calls=900,
+    )
+
+
+def test_request_error_is_wrapped_without_sensitive_details(instance, mocker):
+    """ProviderError must not expose an API key from the request URL."""
+    mocker.patch(
+        'batcontrol.forecastsolar.fcsolar.requests.get',
+        side_effect=requests.exceptions.ConnectionError(
+            'request failed for https://api.forecast.solar/secret-key/estimate'),
+    )
+
+    with pytest.raises(ProviderError) as error_info:
+        instance.get_raw_data_from_provider('roof')
+
+    assert str(error_info.value) == 'Forecast solar API request failed'
+    formatted_error = ''.join(traceback.format_exception(
+        type(error_info.value), error_info.value, error_info.value.__traceback__))
+    assert 'secret-key' not in formatted_error
+
+
+def test_refresh_keeps_cached_data_on_request_error(instance, mocker, caplog):
+    """A transient request failure must leave the last good response cached."""
+    cached_response = {'result': 'last-known-good'}
+    instance.store_raw_data('roof', cached_response)
+    mocker.patch(
+        'batcontrol.forecastsolar.fcsolar.requests.get',
+        side_effect=requests.exceptions.ConnectionError(
+            'request failed for https://api.forecast.solar/secret-key/estimate'),
+    )
+
+    instance.refresh_data()
+
+    assert instance.get_raw_data('roof') == cached_response
+    assert 'secret-key' not in caplog.text