Merge pull request #149 from Nicxe/beta

v.2.3.3

Author: Nicxe

README.md

@@ -359,8 +359,28 @@ def _extract_items(msg) -> list[dict]:
             return [m for m in msg if isinstance(m, dict)]
         if isinstance(msg, dict):
             # Some payloads contain { "Messages": [ ... ] }
-            if isinstance(msg.get("Messages"), list):
-                return [m for m in msg.get("Messages") if isinstance(m, dict)]
+            messages = msg.get("Messages")
+            if isinstance(messages, list):
+                return [m for m in messages if isinstance(m, dict)]
+            # Some payloads contain { "Messages": { "1": {...}, "2": {...}, ... } }
+            if isinstance(messages, dict) and messages:
+                try:
+                    numeric_keys = [k for k in messages.keys() if str(k).isdigit()]
+                    # Sort by numeric key to preserve order if automations iterate
+                    numeric_keys.sort(key=lambda x: int(x))
+                    result: list[dict] = []
+                    for key in numeric_keys:
+                        val = messages.get(key)
+                        if isinstance(val, dict):
+                            item = dict(val)
+                            # Provide stable id if not present
+                            item.setdefault("id", int(key))
+                            result.append(item)
+                    if result:
+                        return result
+                except Exception:
+                    # Fall through to wrapper-as-item if something unexpected happens
+                    pass
             # Or a single message
             return [msg]
         return []

custom_components/f1_sensor/__init__.py

@@ -62,7 +62,8 @@ def normalize_track_status(raw: dict | None) -> str | None:
         "4": "SC",          # Säkrast stöd för Safety Car
         "5": "RED",
         "6": "VSC",
-        "7": "VSC_ENDING",
+        # Code "7" represents VSC ending phase; map to canonical VSC
+        "7": "VSC",
         "8": "CLEAR",       # Fallback, observerad som CLEAR i praktiken
         # "3": okänd/kontextberoende – logga och validera mot Race Control
      }

custom_components/f1_sensor/helpers.py

@@ -7,5 +7,5 @@
     "iot_class": "cloud_polling",
     "issue_tracker": "https://github.com/Nicxe/f1_sensor/issues",
     "requirements": ["timezonefinder==5.2.0", "python-dateutil>=2.8"],
-    "version": "2.3.2"
+    "version": "2.3.3"
 }

custom_components/f1_sensor/manifest.json

@@ -458,36 +458,41 @@ async def _update_weather(self):
         if not times:
             return
         curr = times[0].get("data", {}).get("instant", {}).get("details", {})
-        # Derive current precipitation from forecast block (instant does not include precipitation)
-        current_forecast_block = (
-            times[0].get("data", {}).get("next_1_hours")
-            or times[0].get("data", {}).get("next_6_hours")
-            or times[0].get("data", {}).get("next_12_hours")
-            or {}
-        )
-        current_precip_details = current_forecast_block.get("details", {})
-        current_precip = (
-            current_precip_details.get("precipitation_amount")
-            if current_precip_details.get("precipitation_amount") is not None
-            else (
-                current_precip_details.get("precipitation_amount_min")
-                if current_precip_details.get("precipitation_amount_min") is not None
-                else current_precip_details.get("precipitation_amount_max", 0)
-            )
-        )
+        # Derive current precipitation from forecast blocks (prefer max of 1h/6h/12h)
+        data0 = times[0].get("data", {})
+        block1 = data0.get("next_1_hours") or {}
+        block6 = data0.get("next_6_hours") or {}
+        block12 = data0.get("next_12_hours") or {}
+
+        def _precip_triplet(block: dict):
+            details = (block or {}).get("details", {}) or {}
+            amt = details.get("precipitation_amount")
+            if amt is None:
+                amt = details.get("precipitation_amount_min")
+            if amt is None:
+                amt = details.get("precipitation_amount_max")
+            if amt is None:
+                amt = 0
+            return amt, details.get("precipitation_amount_min"), details.get("precipitation_amount_max")
+
+        p1, p1min, p1max = _precip_triplet(block1)
+        p6, p6min, p6max = _precip_triplet(block6)
+        p12, p12min, p12max = _precip_triplet(block12)
+        candidates = [
+            (p1, p1min, p1max, block1),
+            (p6, p6min, p6max, block6),
+            (p12, p12min, p12max, block12),
+        ]
+        sel_amt, sel_min, sel_max, sel_block = max(candidates, key=lambda t: t[0])
         curr_with_precip = dict(curr)
-        curr_with_precip["precipitation_amount"] = current_precip
-        # Also expose min/max precipitation from forecast if available; fallback to amount
-        _cur_min = current_precip_details.get("precipitation_amount_min")
-        _cur_max = current_precip_details.get("precipitation_amount_max")
-        curr_with_precip["precipitation_amount_min"] = _cur_min if _cur_min is not None else current_precip
-        curr_with_precip["precipitation_amount_max"] = _cur_max if _cur_max is not None else current_precip
+        curr_with_precip["precipitation_amount"] = sel_amt
+        # Also expose min/max precipitation; fallback to selected amount when missing
+        _cur_min = sel_min
+        _cur_max = sel_max
+        curr_with_precip["precipitation_amount_min"] = _cur_min if _cur_min is not None else sel_amt
+        curr_with_precip["precipitation_amount_max"] = _cur_max if _cur_max is not None else sel_amt
         self._current = self._extract(curr_with_precip)
-        current_symbol = (
-            current_forecast_block
-            .get("summary", {})
-            .get("symbol_code")
-        )
+        current_symbol = (sel_block or {}).get("summary", {}).get("symbol_code")
         current_icon = SYMBOL_CODE_TO_MDI.get(current_symbol, self._attr_icon)
         self._attr_icon = current_icon
         start_iso = (
@@ -512,36 +517,26 @@ async def _update_weather(self):
                 )
                 data_entry = closest.get("data", {})
                 instant_details = data_entry.get("instant", {}).get("details", {})
-                # Prefer 1-hour precipitation at race start, fallback to 6/12-hour blocks
-                race_forecast_block = (
-                    data_entry.get("next_1_hours")
-                    or data_entry.get("next_6_hours")
-                    or data_entry.get("next_12_hours")
-                    or {}
-                )
-                race_precip_details = race_forecast_block.get("details", {})
-                race_precip = (
-                    race_precip_details.get("precipitation_amount")
-                    if race_precip_details.get("precipitation_amount") is not None
-                    else (
-                        race_precip_details.get("precipitation_amount_min")
-                        if race_precip_details.get("precipitation_amount_min") is not None
-                        else race_precip_details.get("precipitation_amount_max", 0)
-                    )
-                )
+                # Choose race precipitation as max of 1h/6h/12h around start time
+                r1 = data_entry.get("next_1_hours") or {}
+                r6 = data_entry.get("next_6_hours") or {}
+                r12 = data_entry.get("next_12_hours") or {}
+                rp1, rp1min, rp1max = _precip_triplet(r1)
+                rp6, rp6min, rp6max = _precip_triplet(r6)
+                rp12, rp12min, rp12max = _precip_triplet(r12)
+                rcandidates = [
+                    (rp1, rp1min, rp1max, r1),
+                    (rp6, rp6min, rp6max, r6),
+                    (rp12, rp12min, rp12max, r12),
+                ]
+                r_sel_amt, r_sel_min, r_sel_max, r_sel_block = max(rcandidates, key=lambda t: t[0])
                 rd = dict(instant_details)
-                rd["precipitation_amount"] = race_precip
-                # Also expose min/max precipitation at race time if available; fallback to amount
-                _race_min = race_precip_details.get("precipitation_amount_min")
-                _race_max = race_precip_details.get("precipitation_amount_max")
-                rd["precipitation_amount_min"] = _race_min if _race_min is not None else race_precip
-                rd["precipitation_amount_max"] = _race_max if _race_max is not None else race_precip
+                rd["precipitation_amount"] = r_sel_amt
+                # Also expose min/max precipitation at race time; fallback to selected amount
+                rd["precipitation_amount_min"] = r_sel_min if r_sel_min is not None else r_sel_amt
+                rd["precipitation_amount_max"] = r_sel_max if r_sel_max is not None else r_sel_amt
                 self._race = self._extract(rd)
-                forecast_block = (
-                    data_entry.get("next_1_hours")
-                    or data_entry.get("next_6_hours")
-                    or data_entry.get("next_12_hours", {})
-                )
+                forecast_block = r_sel_block or {}
                 race_symbol = forecast_block.get("summary", {}).get("symbol_code")
                 race_icon = SYMBOL_CODE_TO_MDI.get(race_symbol, self._attr_icon)
                 self._race["weather_icon"] = race_icon
@@ -1537,7 +1532,6 @@ def __init__(self, coordinator, sensor_name, unique_id, entry_id, device_name):
             "CLEAR",
             "YELLOW",
             "VSC",
-            "VSC_ENDING",
             "SC",
             "RED",
         ]
@@ -2175,6 +2169,14 @@ def _apply_payload(self, raw: dict) -> None:
 
         self._attr_native_value = curr
         self._last_received_utc = now_utc
+        # Preserve last known total_laps if not present in this payload to avoid transient 'unknown'
+        prev_total = None
+        try:
+            prev_total = (self._attr_extra_state_attributes or {}).get("total_laps")
+        except Exception:
+            prev_total = None
+        if total is None:
+            total = prev_total
         self._attr_extra_state_attributes = {
             "total_laps": total,
         }

custom_components/f1_sensor/sensor.py

@@ -0,0 +1,37 @@
+---
+id: automation
+title: Automation
+---
+
+
+### Synchronize your lights with the flag status
+
+The Formula 1 Track Status Blueprint for Home Assistant lets you synchronize your lights with the live race flag status. 
+
+[![Open your Home Assistant instance and show the blueprint import dialog with a specific blueprint pre-filled.](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FEvertJob%2FF1-Blueprint%2Fblob%2Fmain%2Fblueprint%2Ff1.yaml)
+
+![F1SensorFlag-ezgif com-video-to-gif-converter (5)](https://github.com/user-attachments/assets/18a74679-76e2-4d10-8a0d-d3f111c42593)
+
+*It is now maintained by [EvertJob](https://github.com/EvertJob/). You can find the latest version and full setup instructions here: 👉 [F1-Blueprint](https://github.com/EvertJob/F1-Blueprint)*
+
+---
+
+### Race Control Event Notifications
+
+This automation listens for f1_sensor_race_control_event events and sends the Message field from each event as a notification in Home Assistant. It provides real-time updates from Race Control, such as flag changes or incident reports.
+
+```yaml
+alias: F1 - Race Control Notification
+description: Sends Race Control messages as notifications in Home Assistant
+trigger:
+  - platform: event
+    event_type: f1_sensor_race_control_event
+condition: []
+action:
+  - service: notify.persistent_notification
+    data:
+      title: "Race Control"
+      message: "{{ trigger.event.data.message.Message }}"
+mode: queued
+max: 10
+```

docs/automation.md

@@ -1,7 +1,6 @@
 ---
 id: events
 title: Race Control
-description: To add the integration to your Home Assistant instance
 ---
 
 

docs/entities/events.md

@@ -1,7 +1,6 @@
 ---
 id: live-data
 title: Live Data
-description: To add the integration to your Home Assistant instance
 ---
 
 By enabling [live data](/getting-started/add-integration)  when configuring the F1 Sensor, Home Assistant can react to live data from an ongoing session such as practice, qualifying, or race. These entities update shortly before, during, and shortly after a session. Outside session times, they will not update. This means that a sensor may show as unknown or display the last known state even when no session is active. For example, the Track Status entity often remains `CLEAR` between race weekends.

docs/entities/live_data.md

@@ -1,7 +1,6 @@
 ---
 id: static-data
 title: Static Data
-description: To add the integration to your Home Assistant instance
 ---
 
 Information that rarely changes, such as schedules, drivers, circuits, and championship standings.

docs/entities/static_data.md

@@ -1,7 +1,13 @@
 ---
 id: e-ink
 title: E-ink Display
-description: Learn how to contribute to the project, and support the development of the F1 Sensor for Home Assistant
 ---
 
-I personally use this integration to display the next race and the following three races on an e-ink display. You can read more about that setup here.
+
+I personally use this integration to display the next race and the following three races on an e-ink display. 
+
+You can read more about that setup here - [E-ink displays power by ESPhome and Home Assistant](https://github.com/Nicxe/esphome).
+
+
+
+![E-ink display](/img/F1_pitwall.png)