Fixes unit on last pour for Keg

Author: JohNan

README.md

@@ -34,9 +34,16 @@ optional arguments:
     TEMPERATURE = "v56"
     UNIT_TYPE = "v71"
     MEASURE_UNIT = "v75"
+    MASS_UNIT = "v73"
     VOLUME_UNIT = "v82"
     LAST_POUR = "v59"
     DATE = "v67"
+    OG = "v65"
+    FG = "v66"
+    ABV = "v68"
+    FIRMWARE_VERSION = "v93"
+    LEAK_DETECTION = "v83"
+    MODE = "v88"
 ```
 
 ### AirLock
@@ -46,7 +53,7 @@ optional arguments:
     BATCH_VOLUME = "v104"
     OG = "v105"
     SG = "v106"
-    ABV = "107"
+    ABV = "v107"
     TEMPERATURE_UNIT = "v108"
     VOLUME_UNIT = "v109"
     BUBBLES = "v110"

pyplaato/const.py

@@ -4,8 +4,12 @@
 UNIT_TEMP_CELSIUS = "°C"
 UNIT_TEMP_FAHRENHEIT = "°F"
 UNIT_PERCENTAGE = "%"
+UNIT_OZ = "oz"
+UNIT_ML = "ml"
 UNIT_BUBBLES_PER_MINUTE = "bpm"
 
+METRIC = "1"
+
 # Webhook attributes
 ATTR_DEVICE_ID = "device_id"
 ATTR_DEVICE_NAME = "device_name"

pyplaato/models/airlock.py

@@ -46,7 +46,10 @@ def from_web_hook(cls, data):
     @property
     def temperature(self):
         if self.__temperature is not None:
-            return round(float(self.__temperature), 1)
+            try:
+                return round(float(self.__temperature), 1)
+            except ValueError:
+                return self.__temperature
 
     @property
     def abv(self):

pyplaato/models/keg.py

@@ -5,7 +5,8 @@
 
 from .device import PlaatoDevice, PlaatoDeviceType
 from .pins import PinsBase
-from ..const import UNIT_TEMP_CELSIUS, UNIT_TEMP_FAHRENHEIT, UNIT_PERCENTAGE
+from ..const import UNIT_TEMP_CELSIUS, UNIT_TEMP_FAHRENHEIT, UNIT_PERCENTAGE, \
+    METRIC, UNIT_OZ, UNIT_ML
 
 
 class PlaatoKeg(PlaatoDevice):
@@ -29,7 +30,7 @@ def __init__(self, attrs):
         self.__pouring = attrs.get(self.Pins.POURING, False)
         self.__beer_left = attrs.get(self.Pins.BEER_LEFT, None)
         self.__temperature = attrs.get(self.Pins.TEMPERATURE, None)
-        self.__temperature_unit = attrs.get(self.Pins.TEMPERATURE_UNIT, None)
+        self.__unit_type = attrs.get(self.Pins.UNIT_TYPE, None)
         self.__last_pour = attrs.get(self.Pins.LAST_POUR, None)
         self.__date = attrs.get(self.Pins.DATE, None)
 
@@ -53,7 +54,7 @@ def temperature(self):
 
     @property
     def temperature_unit(self):
-        if self.__temperature_unit is "1":
+        if self.__unit_type == METRIC:
             return UNIT_TEMP_CELSIUS
         return UNIT_TEMP_FAHRENHEIT
 
@@ -74,9 +75,9 @@ def last_pour(self):
 
     @property
     def last_pour_unit(self):
-        if self.measure_unit is "1":
-            return self.mass_unit
-        return self.volume_unit
+        if self.__unit_type == METRIC:
+            return UNIT_ML
+        return UNIT_OZ
 
     @property
     def abv(self):
@@ -90,7 +91,7 @@ def pouring(self):
         255 = Pouring
         :return: True if 255 = Pouring else False
         """
-        return self.__pouring is "255"
+        return self.__pouring == "255"
 
     @property
     def leak_detection(self):
@@ -99,15 +100,15 @@ def leak_detection(self):
         0 = Not Leaking
         :return: True if 1 = Leaking else False
         """
-        return self.__leak_detection is "1"
+        return self.__leak_detection == "1"
 
     @property
     def mode(self):
         """
         1 = Beer
         2 = Co2
         """
-        return "Beer" if self.__mode is "1" else "Co2"
+        return "Beer" if self.__mode == "1" else "Co2"
 
     @property
     def name(self) -> str:
@@ -185,7 +186,7 @@ class Pins(PinsBase, Enum):
         BEER_LEFT = "v51"
         BEER_LEFT_UNIT = "v74"
         TEMPERATURE = "v56"
-        TEMPERATURE_UNIT = "v71"
+        UNIT_TYPE = "v71"
         MEASURE_UNIT = "v75"
         MASS_UNIT = "v73"
         VOLUME_UNIT = "v82"

pyplaato/plaato.py

@@ -44,7 +44,7 @@ async def get_keg_data(self, session: ClientSession) -> PlaatoKeg:
         errors = Plaato._get_errors_as_string(result)
         if errors:
             logging.getLogger(__name__) \
-                .error(f"Failed to get values for {errors}")
+                .warning(f"Failed to get value for {errors}")
 
         return PlaatoKeg(result)
 
@@ -57,7 +57,7 @@ async def get_airlock_data(self, session: ClientSession) -> PlaatoAirlock:
         errors = Plaato._get_errors_as_string(result)
         if errors:
             logging.getLogger(__name__) \
-                .error(f"Failed to get values for {errors}")
+                .warning(f"Failed to get value for {errors}")
 
         return PlaatoAirlock(result)
 
@@ -81,7 +81,7 @@ async def fetch_data(self, session: ClientSession, pin: PinsBase):
 
             except JSONDecodeError as e:
                 logging.getLogger(__name__)\
-                    .error(f"Failed to decode json for pin {pin} - {e.msg}")
+                    .warning(f"Failed to decode json for pin {pin} - {e.msg}")
             return result
 
     @staticmethod

requirements.txt

@@ -0,0 +1,2 @@
+aiohttp==3.7.3
+python-dateutil==2.8.1

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pyplaato",
-    version="0.0.14",
+    version="0.0.15",
     author="JohNan",
     author_email="johan.nanzen@gmail.com",
     description="Asynchronous Python client for getting Plaato Airlock and Keg data",