Merge pull request #53 from zweckj/vnext

sync bt and cloud parameters

Author: zweckj

Diff for: lmcloud/client_bluetooth.py

@@ -48,7 +48,7 @@ def __init__(
 
     @staticmethod
     async def discover_devices(
-        scanner: BaseBleakScanner,
+        scanner: BaseBleakScanner | BleakScanner | None = None,
     ) -> list[BLEDevice]:
         """Find machines based on model name."""
         ble_devices: list[BLEDevice] = []
@@ -84,10 +84,10 @@ def update_ble_device(self, ble_device: BLEDevice) -> None:
 
         self._client = BleakClient(ble_device)
 
-    async def set_power(self, state: bool) -> None:
+    async def set_power(self, enabled: bool) -> None:
         """Power on the machine."""
 
-        mode = "BrewingMode" if state else "StandBy"
+        mode = "BrewingMode" if enabled else "StandBy"
         data = {
             "name": "MachineChangeMode",
             "parameter": {
@@ -96,19 +96,19 @@ async def set_power(self, state: bool) -> None:
         }
         await self._write_bluetooth_json_message(data)
 
-    async def set_steam(self, state: bool) -> None:
+    async def set_steam(self, enabled: bool) -> None:
         """Power cycle steam."""
 
         data = {
             "name": "SettingBoilerEnable",
             "parameter": {
                 "identifier": "SteamBoiler",
-                "state": state,
+                "state": enabled,
             },
         }
         await self._write_bluetooth_json_message(data)
 
-    async def set_temp(self, boiler: BoilerType, temperature: int) -> None:
+    async def set_temp(self, boiler: BoilerType, temperature: float) -> None:
         """Set boiler temperature (in Celsius)"""
 
         data = {

Diff for: lmcloud/client_cloud.py

@@ -137,13 +137,13 @@ async def set_power(
     async def set_steam(
         self,
         serial_number: str,
-        steam_state: bool,
+        enabled: bool,
     ) -> bool:
         """Turn Steamboiler on or off"""
 
         data = {
             "identifier": BoilerType.STEAM,
-            "state": steam_state,
+            "state": enabled,
         }
         url = f"{GW_MACHINE_BASE_URL}/{serial_number}/enable-boiler"
         response = await self._rest_api_call(url=url, method=HTTPMethod.POST, data=data)

Diff for: lmcloud/lm_machine.py

@@ -165,7 +165,7 @@ async def set_power(
 
     async def set_steam(
         self,
-        steam_state: bool,
+        enabled: bool,
         ble_device: BLEDevice | None = None,
     ) -> bool:
         """Turn Steamboiler on or off"""
@@ -174,9 +174,9 @@ async def set_steam(
             command="set_steam",
             ble_device=ble_device,
             serial_number=self.serial_number,
-            enabled=steam_state,
+            enabled=enabled,
         ):
-            self.config.boilers[BoilerType.STEAM].enabled = steam_state
+            self.config.boilers[BoilerType.STEAM].enabled = enabled
             return True
         return False
 
@@ -372,6 +372,7 @@ def on_websocket_message_received(self, message: str | bytes) -> None:
             notify = self._parse_websocket_message(message)
         except UnknownWebSocketMessage as exc:
             _LOGGER.warning("Unknown websocket message received")
+            _LOGGER.warning("Message: %s", message)
             _LOGGER.debug(exc)
 
         if notify and self._notify_callback:
@@ -440,8 +441,7 @@ def _parse_list_message(self, message: list[dict[str, Any]]) -> bool:
                 property_updated = True
 
             elif "MachineStatistics" in msg:
-                self.parse_statistics(json.loads(msg["MachineStatistics"]))
-                property_updated = True
+                continue
 
             elif "BrewingUpdateGroup1Time" in msg:
                 self.config.brew_active_duration = msg["BrewingUpdateGroup1Time"]

Diff for: setup.py

@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="lmcloud",
-    version="1.0.0b6",
+    version="1.0.0b7",
     description="A Python implementation of the new La Marzocco API",
     long_description=readme,
     long_description_content_type="text/markdown",