Merge pull request #102 from Pyhass/fix-pr-issue

Fix via device issue

Author: KJonline

pyhiveapi/apyhiveapi/session.py

@@ -103,6 +103,7 @@ def __init__(
         )
         self.devices = {}
         self.deviceList = {}
+        self.hub_id = None
 
     def openFile(self, file: str):
         """Open a file.
@@ -145,7 +146,7 @@ def addList(self, entityType: str, data: dict, **kwargs: dict):
                 "hiveType": data.get("type", ""),
                 "haType": entityType,
                 "deviceData": device.get("props", data.get("props", {})),
-                "parentDevice": data.get("parent", None),
+                "parentDevice": self.hub_id,
                 "isGroup": data.get("isGroup", False),
                 "device_id": device["id"],
                 "device_name": device_name,
@@ -160,6 +161,7 @@ def addList(self, entityType: str, data: dict, **kwargs: dict):
 
             if data.get("type", "") == "hub":
                 self.deviceList["parent"].append(formatted_data)
+                self.deviceList[entityType].append(formatted_data)
             else:
                 self.deviceList[entityType].append(formatted_data)
 
@@ -532,6 +534,25 @@ async def createDevices(self):
         self.deviceList["switch"] = []
         self.deviceList["water_heater"] = []
 
+        hive_type = HIVE_TYPES["Thermo"] + HIVE_TYPES["Sensor"]
+        for aDevice in self.data["devices"]:
+            if self.data["devices"][aDevice]["type"] == "hub":
+                self.hub_id = aDevice
+                break
+        for aDevice in self.data["devices"]:
+            d = self.data.devices[aDevice]
+            device_list = DEVICES.get(self.data.devices[aDevice]["type"], [])
+            for code in device_list:
+                eval("self." + code)
+
+            if self.data["devices"][aDevice]["type"] in hive_type:
+                self.config.battery.append(d["id"])
+
+        if "action" in HIVE_TYPES["Switch"]:
+            for action in self.data["actions"]:
+                a = self.data["actions"][action]  # noqa: F841
+                eval("self." + ACTIONS)
+
         hive_type = HIVE_TYPES["Heating"] + HIVE_TYPES["Switch"] + HIVE_TYPES["Light"]
         for aProduct in self.data.products:
             p = self.data.products[aProduct]
@@ -555,21 +576,6 @@ async def createDevices(self):
             if self.data.products[aProduct]["type"] in hive_type:
                 self.config.mode.append(p["id"])
 
-        hive_type = HIVE_TYPES["Thermo"] + HIVE_TYPES["Sensor"]
-        for aDevice in self.data["devices"]:
-            d = self.data.devices[aDevice]
-            device_list = DEVICES.get(self.data.devices[aDevice]["type"], [])
-            for code in device_list:
-                eval("self." + code)
-
-            if self.data["devices"][aDevice]["type"] in hive_type:
-                self.config.battery.append(d["id"])
-
-        if "action" in HIVE_TYPES["Switch"]:
-            for action in self.data["actions"]:
-                a = self.data["actions"][action]  # noqa: F841
-                eval("self." + ACTIONS)
-
         return self.deviceList
 
     @staticmethod

setup.py

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