Tweak geniushub and bump client to v0.6.26

homeassistant/components/geniushub/__init__.py

@@ -88,7 +88,7 @@ async def async_update(self, now, **kwargs):
         try:
             await self.client.update()
         except aiohttp.ClientResponseError as err:
-            _LOGGER.warning("Update failed, %s", err)
+            _LOGGER.warning("Update failed, message is: %s", err)
             return
         self.make_debug_log_entries()
 

homeassistant/components/geniushub/binary_sensor.py

@@ -6,15 +6,18 @@
 
 from . import DOMAIN, GeniusEntity
 
-GH_IS_SWITCH = ["Dual Channel Receiver", "Electric Switch", "Smart Plug"]
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Genius Hub sensor entities."""
+    if discovery_info is None:
+        return
+
     client = hass.data[DOMAIN]["client"]
 
     switches = [
-        GeniusBinarySensor(d) for d in client.device_objs if d.type[:21] in GH_IS_SWITCH
+        GeniusBinarySensor(d)
+        for d in client.device_objs
+        if "outputOnOff" in d.data["state"]
     ]
 
     async_add_entities(switches)
@@ -44,9 +47,13 @@ def device_state_attributes(self) -> Dict[str, Any]:
         attrs = {}
         attrs["assigned_zone"] = self._device.data["assignedZones"][0]["name"]
 
-        # pylint: disable=protected-access
-        last_comms = self._device._raw["childValues"]["lastComms"]["val"]
+        attrs["state"] = dict(self._device.data["state"])
+        attrs["state"].update(self._device.data["_state"])
+        attrs["state"].pop("outputOnOff")
+        attrs["state"].pop("lastComms")
+
+        last_comms = self._device.data["_state"]["lastComms"]
         if last_comms != 0:
             attrs["last_comms"] = utc_from_timestamp(last_comms).isoformat()
 
-        return {**attrs}
+        return attrs

homeassistant/components/geniushub/climate.py

@@ -29,10 +29,11 @@
 GH_PRESET_TO_HA = {v: k for k, v in HA_PRESET_TO_GH.items()}
 
 
-async def async_setup_platform(
-    hass, hass_config, async_add_entities, discovery_info=None
-):
+async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Genius Hub climate entities."""
+    if discovery_info is None:
+        return
+
     client = hass.data[DOMAIN]["client"]
 
     entities = [

homeassistant/components/geniushub/manifest.json

@@ -3,7 +3,7 @@
   "name": "Genius Hub",
   "documentation": "https://www.home-assistant.io/components/geniushub",
   "requirements": [
-    "geniushub-client==0.6.13"
+    "geniushub-client==0.6.16"
   ],
   "dependencies": [],
   "codeowners": ["@zxdavb"]

homeassistant/components/geniushub/sensor.py

@@ -7,8 +7,6 @@
 
 from . import DOMAIN, GeniusEntity
 
-GH_HAS_BATTERY = ["Room Thermostat", "Genius Valve", "Room Sensor", "Radiator Valve"]
-
 GH_LEVEL_MAPPING = {
     "error": "Errors",
     "warning": "Warnings",
@@ -18,9 +16,16 @@
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Genius Hub sensor entities."""
+    if discovery_info is None:
+        return
+
     client = hass.data[DOMAIN]["client"]
 
-    sensors = [GeniusBattery(d) for d in client.device_objs if d.type in GH_HAS_BATTERY]
+    sensors = [
+        GeniusBattery(d)
+        for d in client.device_objs
+        if "batteryLevel" in d.data["state"]
+    ]
     issues = [GeniusIssue(client, i) for i in list(GH_LEVEL_MAPPING)]
 
     async_add_entities(sensors + issues, update_before_add=True)
@@ -85,11 +90,15 @@ def device_state_attributes(self) -> Dict[str, Any]:
         attrs = {}
         attrs["assigned_zone"] = self._device.data["assignedZones"][0]["name"]
 
-        # pylint: disable=protected-access
-        last_comms = self._device._raw["childValues"]["lastComms"]["val"]
+        attrs["state"] = dict(self._device.data["state"])
+        attrs["state"].update(self._device.data["_state"])
+        attrs["state"].pop("batteryLevel")
+        attrs["state"].pop("lastComms")
+
+        last_comms = self._device.data["_state"]["lastComms"]
         attrs["last_comms"] = utc_from_timestamp(last_comms).isoformat()
 
-        return {**attrs}
+        return attrs
 
 
 class GeniusIssue(GeniusEntity):

homeassistant/components/geniushub/water_heater.py

@@ -37,10 +37,11 @@
 GH_STATE_ATTRS = ["type", "override"]
 
 
-async def async_setup_platform(
-    hass, hass_config, async_add_entities, discovery_info=None
-):
+async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Genius Hub water_heater entities."""
+    if discovery_info is None:
+        return
+
     client = hass.data[DOMAIN]["client"]
 
     entities = [
@@ -68,11 +69,8 @@ def name(self) -> str:
     @property
     def device_state_attributes(self) -> Dict[str, Any]:
         """Return the device state attributes."""
-        return {
-            "status": {
-                k: v for k, v in self._boiler.data.items() if k in GH_STATE_ATTRS
-            }
-        }
+        tmp = self._boiler.data.items()
+        return {"status": {k: v for k, v in tmp if k in GH_STATE_ATTRS}}
 
     @property
     def current_temperature(self) -> Optional[float]:

requirements_all.txt

@@ -527,7 +527,7 @@ gearbest_parser==1.0.7
 geizhals==0.0.9
 
 # homeassistant.components.geniushub
-geniushub-client==0.6.13
+geniushub-client==0.6.16
 
 # homeassistant.components.geo_json_events
 # homeassistant.components.nsw_rural_fire_service_feed