Merge pull request #28 from guerda/fix_slots

Fix time slot determination

.github/workflows/python-app.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v4
@@ -31,3 +31,6 @@ jobs:
         
     - name: Lint with ruff
       run: pipenv run ruff check
+
+    - name: Test with pytest
+      run: pipenv run pytest

Pipfile

@@ -11,6 +11,7 @@ playwright = "*"
 
 [dev-packages]
 ruff = "*"
+pytest = "*"
 
 [requires]
 python_version = "3.11"

euemastobot.py

@@ -11,17 +11,7 @@
 mastodon = None
 
 
-def get_time_slots():
-    api_url = "https://api.energy-charts.info/ren_share_forecast?country=de"
-    headers = {
-        "accept": "application/json",
-        "User-Agent": "Erneuerbare Energien Überschuss Mastobot",
-    }
-    r = requests.get(api_url, headers=headers)
-    r.raise_for_status()
-    logger.info("got the forecast data")
-    forecast = r.json()
-
+def get_slots_from_forecast(forecast):
     i = 0
     filter_above_threshold = []
     for row in forecast["ren_share"]:
@@ -30,22 +20,48 @@ def get_time_slots():
         else:
             filter_above_threshold.append(0)
         i += 1
-
+    logging.debug("Above threshold: ")
+    logging.debug(filter_above_threshold)
+    start = 0
     previous = 0
     slots = []
     i = 0
+    added = True
     for time_slice in filter_above_threshold:
         if time_slice != previous:
             previous = time_slice
             if time_slice == 1:
                 start = forecast["unix_seconds"][i]
+                added = False
             elif time_slice == 0:
                 end = forecast["unix_seconds"][i - 1]
                 start_text = datetime.fromtimestamp(start).strftime("%H:%M")
                 end_text = datetime.fromtimestamp(end).strftime("%H:%M")
                 slots.append((start_text, end_text))
+                added = True
         i += 1
 
+    # If the threshold was exceeded at the end, has it been added to the array yet?
+    if not added:
+        start_text = datetime.fromtimestamp(start).strftime("%H:%M")
+        end_text = "0:00"
+        slots.append((start_text, end_text))
+    return slots
+
+
+def get_time_slots():
+    api_url = "https://api.energy-charts.info/ren_share_forecast?country=de"
+    headers = {
+        "accept": "application/json",
+        "User-Agent": "Erneuerbare Energien Überschuss Mastobot",
+    }
+    r = requests.get(api_url, headers=headers)
+    r.raise_for_status()
+    logger.info("got the forecast data")
+    forecast = r.json()
+
+    slots = get_slots_from_forecast(forecast)
+
     return slots
 
 

pytest.ini

@@ -0,0 +1,4 @@
+[pytest]
+log_format = %(asctime)s %(levelname)s %(message)s
+log_date_format = %Y-%m-%d %H:%M:%S
+log_level = DEBUG