Merge pull request #82 from Pyhass/fix-trv-handling

Create and catch Key error for TRV matching

pyhiveapi/apyhiveapi/helper/hive_helper.py

@@ -81,7 +81,7 @@ def getDeviceData(self, product: dict):
         Returns:
             [type]: Device data.
         """
-        device = product
+        device_id = product["id"]
         type = product["type"]
         if type in ("heating", "hotwater"):
             for aDevice in self.session.data.devices:
@@ -91,19 +91,23 @@ def getDeviceData(self, product: dict):
                             product["props"]["zone"]
                             == self.session.data.devices[aDevice]["props"]["zone"]
                         ):
-                            device = self.session.data.devices[aDevice]
+                            device_id = self.session.data.devices[aDevice]["id"]
                     except KeyError:
                         pass
         elif type == "trvcontrol":
-            device = self.session.data.devices[product["props"]["trvs"][0]]
+            trv_present = len(product["props"]["trvs"]) > 0
+            if trv_present:
+                device_id = self.session.data.devices[product["props"]["trvs"][0]]["id"]
+            else:
+                raise KeyError
         elif type == "warmwhitelight" and product["props"]["model"] == "SIREN001":
-            device = self.session.data.devices[product["parent"]]
+            device_id = self.session.data.devices[product["parent"]]
         elif type == "sense":
-            device = self.session.data.devices[product["parent"]]
+            device_id = self.session.data.devices[product["parent"]]
         else:
-            device = self.session.data.devices[product["id"]]
+            device_id = self.session.data.devices[product["id"]]
 
-        return device
+        return device_id
 
     def convertMinutesToTime(self, minutes_to_convert: str):
         """Convert minutes string to datetime.

pyhiveapi/apyhiveapi/session.py

@@ -128,15 +128,15 @@ def addList(self, entityType: str, data: dict, **kwargs: dict):
         Returns:
             dict: Entity.
         """
-        device = self.helper.getDeviceData(data)
-        device_name = (
-            device["state"]["name"]
-            if device["state"]["name"] != "Receiver"
-            else "Heating"
-        )
-        formatted_data = {}
-
         try:
+            device = self.helper.getDeviceData(data)
+            device_name = (
+                device["state"]["name"]
+                if device["state"]["name"] != "Receiver"
+                else "Heating"
+            )
+            formatted_data = {}
+
             formatted_data = {
                 "hiveID": data.get("id", ""),
                 "hiveName": device_name,
@@ -154,11 +154,11 @@ def addList(self, entityType: str, data: dict, **kwargs: dict):
             else:
                 formatted_data["haName"] = device_name
             formatted_data.update(kwargs)
+            self.deviceList[entityType].append(formatted_data)
+            return formatted_data
         except KeyError as error:
             self.logger.error(error)
-
-        self.deviceList[entityType].append(formatted_data)
-        return formatted_data
+            return None
 
     async def updateInterval(self, new_interval: timedelta):
         """Update the scan interval.
@@ -535,10 +535,12 @@ async def createDevices(self):
             ):
                 continue
             product_list = PRODUCTS.get(self.data.products[aProduct]["type"], [])
+            product_name = self.data.products[aProduct]["state"].get("name", "Unknown")
             for code in product_list:
                 try:
                     eval("self." + code)
-                except:
+                except (NameError, AttributeError) as e:
+                    self.log.warning(f"Device {product_name} cannot be setup - {e}")
                     pass
 
             if self.data.products[aProduct]["type"] in hive_type:

setup.py

@@ -16,7 +16,7 @@ def requirements_from_file(filename="requirements.txt"):
 
 
 setup(
-    version="0.5.16",
+    version="0.5.17",
     package_data={"data": ["*.json"]},
     include_package_data=True,
     cmdclass={