Libary Version 0.3.4.3

Author: Khole Jones

pyhiveapi/api/hive_async_api.py

@@ -22,7 +22,7 @@ class HiveAsync:
 
     def __init__(self, websession: Optional[ClientSession] = None):
         """Hive API initialisation."""
-        self.log = Logger()
+        self.logger = Logger()
         self.baseUrl = "https://beekeeper.hivehome.com/1.0"
         self.urls = {
             "properties": "https://sso.hivehome.com/",
@@ -53,7 +53,7 @@ def __init__(self, websession: Optional[ClientSession] = None):
     async def request(self, method: str, url: str, **kwargs) -> ClientResponse:
         """Make a request."""
         data = kwargs.get("data", None)
-        await self.log.log(
+        await self.logger.log(
             "No_ID",
             "API",
             "Request is - {0}:{1}  Body is {2}",
@@ -66,7 +66,7 @@ async def request(self, method: str, url: str, **kwargs) -> ClientResponse:
             if "sso" in url:
                 pass
             else:
-                self.log.log("No_ID", "API", "ERROR - NO API TOKEN")
+                self.logger.log("No_ID", "API", "ERROR - NO API TOKEN")
                 raise NoApiToken
 
         async with self.websession.request(
@@ -79,16 +79,16 @@ async def request(self, method: str, url: str, **kwargs) -> ClientResponse:
             )
 
         if operator.contains(str(resp.status), "20"):
-            await self.log.log(
+            await self.logger.log(
                 "API", "API", "Response is - {0}", info=[str(resp.status)]
             )
         elif resp.status == HTTP_UNAUTHORIZED:
-            await self.log.error_check(
-                "No_ID", "ERROR", "Failed_API", resp=resp["original"]
+            await self.logger.LOGGER.error(
+                f"Hive token as expired when calling {url} - "
+                f"HTTP status is - {resp.status}"
             )
-
         else:
-            self.log.LOGGER.error(
+            await self.logger.LOGGER.error(
                 f"Something has gone wrong calling {url} - "
                 f"HTTP status is - {resp.status}"
             )
@@ -265,7 +265,7 @@ async def set_action(self, n_id, data):
 
     async def error(self):
         """An error has occured iteracting wth the Hive API."""
-        await self.log.log("API_ERROR", "ERROR", "Error attempting API call")
+        await self.logger.log("API_ERROR", "ERROR", "Error attempting API call")
         raise web_exceptions.HTTPError
 
     async def is_file_being_used(self):

pyhiveapi/device_attributes.py

@@ -8,7 +8,7 @@ class Attributes:
     """Device Attributes Code."""
 
     def __init__(self):
-        self.log = Logger()
+        self.logger = Logger()
         self.type = "Attribute"
 
     async def state_attributes(self, n_id, _type):
@@ -33,7 +33,7 @@ async def online_offline(self, n_id):
             data = Data.devices[n_id]
             state = data["props"]["online"]
         except KeyError as e:
-            Helper.error(e)
+            await self.logger.error(e)
 
         return state
 
@@ -47,7 +47,7 @@ async def get_mode(self, n_id):
             state = data["state"]["mode"]
             final = Data.HIVETOHA[self.type].get(state, state)
         except KeyError as e:
-            Helper.error(e)
+            await self.logger.error(e)
 
         return final
 
@@ -60,8 +60,8 @@ async def battery(self, n_id):
             data = Data.devices[n_id]
             state = data["props"]["battery"]
             final = state
-            await self.log.error_check(n_id, self.type, state)
+            await self.logger.error_check(n_id, self.type, state)
         except KeyError as e:
-            Helper.error(e)
+            await self.logger.error(e)
 
         return final

pyhiveapi/helper/hive_helper.py

@@ -45,6 +45,31 @@ def getDeviceFromID(self, n_id):
 
         return data
 
+    def getDeviceData(self, product):
+        """"Get device Data."""
+        device = product
+        type = product['type']
+        if type in ('heating', 'hotwater'):
+            for aDevice in Data.devices:
+                if (Data.devices[aDevice]["type"]
+                    in Data.HIVE_TYPES["Thermo"]
+                    ):
+                    try:
+                        if product["props"]["zone"] == Data.devices[aDevice]['props']['zone']:
+                            device = Data.devices[aDevice]
+                    except KeyError:
+                        pass
+        elif type == 'trvcontrol':
+            device = Data.devices[product["props"]["trvs"][0]]
+        elif type == 'warmwhitelight' and product['props']['model'] == 'SIREN001':
+            device = Data.devices[product['parent']]
+        elif type == 'sense':
+            device = Data.devices[product['parent']]
+        else:
+            device = Data.devices[product['id']]
+
+        return device
+
     def convertMinutesToTime(self, minutes_to_convert):
         """Convert minutes string to datetime."""
         hours_converted, minutes_converted = divmod(minutes_to_convert, 60)

pyhiveapi/helper/logger.py

@@ -63,11 +63,11 @@ async def log(self, n_id, l_type, new_message, **kwargs):
         else:
             pass
 
-    async def error(self, e):
+    async def error(self, e='UNKNOWN'):
         """An unexpected error has occured"""
         self.LOGGER.error(
-            f"An unexpected error has occured whilst {inspect.stack()[1][3]}"
-            f" with exception {e}"
+            f"An unexpected error has occured whilst executing {inspect.stack()[1][3]}"
+            f" with exception {e.__class__} {e}"
         )
 
     async def error_check(self, n_id, n_type, error_type, **kwargs):
@@ -89,11 +89,6 @@ async def error_check(self, n_id, n_type, error_type, **kwargs):
             if n_id not in Data.errorList:
                 self.LOGGER.error(message)
                 Data.errorList.update({n_id: datetime.now()})
-        elif error_type == "Failed_API":
-            new_data = str(kwargs.get("resp"))
-            message = "ERROR - Received {0} response from API."
-            result = True
-            self.LOGGER.error(message.format(new_data))
 
         await self.log(n_id, n_type, message, info=[new_data])
         return result

pyhiveapi/light.py

@@ -22,7 +22,7 @@ async def get_light(self, device):
 
         if device["deviceData"]["online"]:
             self.helper.deviceRecovered(device["device_id"])
-            data = Data.devices[device["hiveID"]]
+            data = Data.devices[device["device_id"]]
             dev_data = {
                 "hiveID": device["hiveID"],
                 "hiveName": device["hiveName"],
@@ -39,7 +39,7 @@ async def get_light(self, device):
                 "parentDevice": data.get("parent", None),
                 "custom": device.get("custom", None),
                 "attributes": await self.attr.state_attributes(
-                    device["hiveID"], device["hiveType"]
+                    device["device_id"], device["hiveType"]
                 ),
             }
 

pyhiveapi/plug.py

@@ -20,7 +20,7 @@ async def get_plug(self, device):
 
         if device["deviceData"]["online"]:
             self.helper.deviceRecovered(device["device_id"])
-            data = Data.devices[device["hiveID"]]
+            data = Data.devices[device["device_id"]]
             dev_data = {
                 "hiveID": device["hiveID"],
                 "hiveName": device["hiveName"],
@@ -37,7 +37,7 @@ async def get_plug(self, device):
                 "parentDevice": data.get("parent", None),
                 "custom": device.get("custom", None),
                 "attributes": await self.attr.state_attributes(
-                    device["hiveID"], device["hiveType"]
+                    device["device_id"], device["hiveType"]
                 ),
             }
 

pyhiveapi/sensor.py

@@ -68,7 +68,7 @@ async def get_sensor(self, device):
                         "deviceData": data.get("props", None),
                         "parentDevice": data.get("parent", None),
                         "attributes": await self.attr.state_attributes(
-                            device["hiveID"], device["hiveType"]
+                            device["device_id"], device["hiveType"]
                         ),
                     }
                 )