Merge pull request #52 from zweckj/vnext

fix websocket parsing

Author: zweckj

lmcloud/lm_grinder.py

@@ -7,7 +7,7 @@
 from .const import GrinderModel, PhysicalKey
 from .client_cloud import LaMarzoccoCloudClient
 from .client_local import LaMarzoccoLocalClient
-from .lm_device import LaMarzoccoDevice, LaMarzoccoStatistics
+from .lm_device import LaMarzoccoDevice
 from .models import LaMarzoccoGrinderConfig
 
 

lmcloud/lm_machine.py

@@ -367,6 +367,7 @@ def on_websocket_message_received(self, message: str | bytes) -> None:
         message = str(message)
 
         _LOGGER.debug("Received message from websocket, message %s", message)
+        notify = False
         try:
             notify = self._parse_websocket_message(message)
         except UnknownWebSocketMessage as exc:
@@ -410,51 +411,63 @@ def _parse_dict_message(self, message: Any) -> bool:
     def _parse_list_message(self, message: list[dict[str, Any]]) -> bool:
         """Parse websocket message that is a list."""
 
+        property_updated = False
         for msg in message:
 
             if "SteamBoilerUpdateTemperature" in msg:
                 self.config.boilers[BoilerType.STEAM].current_temperature = msg[
                     "SteamBoilerUpdateTemperature"
                 ]
+                property_updated = True
 
             elif "CoffeeBoiler1UpdateTemperature" in msg:
                 self.config.boilers[BoilerType.COFFEE].current_temperature = msg[
                     "CoffeeBoiler1UpdateTemperature"
                 ]
+                property_updated = True
 
             elif "Sleep" in msg:
                 self.config.turned_on = False
+                property_updated = True
 
             elif "SteamBoilerEnabled" in msg:
                 value = msg["SteamBoilerEnabled"]
                 self.config.boilers[BoilerType.STEAM].enabled = value
+                property_updated = True
 
             elif "WakeUp" in msg:
                 self.config.turned_on = True
+                property_updated = True
 
             elif "MachineStatistics" in msg:
                 self.parse_statistics(json.loads(msg["MachineStatistics"]))
+                property_updated = True
 
             elif "BrewingUpdateGroup1Time" in msg:
                 self.config.brew_active_duration = msg["BrewingUpdateGroup1Time"]
+                property_updated = True
 
             elif "BrewingStartedGroup1StopType" in msg:
                 self.config.brew_active = True
+                property_updated = True
 
             elif (
                 "BrewingStoppedGroup1StopType" in msg or "BrewingSnapshotGroup1" in msg
             ):
                 self.config.brew_active = False
+                property_updated = True
 
             elif "SteamBoilerUpdateSetPoint" in msg:
                 self.config.boilers[BoilerType.STEAM].target_temperature = msg[
                     "SteamBoilerUpdateSetPoint"
                 ]
+                property_updated = True
 
             elif "CoffeeBoiler1UpdateSetPoint" in msg:
                 self.config.boilers[BoilerType.COFFEE].target_temperature = msg[
                     "CoffeeBoiler1UpdateSetPoint"
                 ]
+                property_updated = True
 
             elif "BoilersTargetTemperature" in msg:
                 boilers = json.loads(msg["BoilersTargetTemperature"])
@@ -463,10 +476,12 @@ def _parse_list_message(self, message: list[dict[str, Any]]) -> bool:
                     self.config.boilers[BoilerType(boiler["id"])].target_temperature = (
                         value
                     )
+                property_updated = True
 
             elif "Boilers" in msg:
                 boilers = json.loads(msg["Boilers"])
                 self.config.boilers = parse_boilers(boilers)
+                property_updated = True
 
             elif "PreinfusionSettings" in msg:
                 settings: dict[str, Any] = {}
@@ -475,5 +490,8 @@ def _parse_list_message(self, message: list[dict[str, Any]]) -> bool:
                 self.config.prebrew_mode, self.config.prebrew_configuration = (
                     parse_preinfusion_settings(settings)
                 )
+                property_updated = True
 
-        raise UnknownWebSocketMessage(f"Unknown websocket message: {message}")
+        if not property_updated:
+            raise UnknownWebSocketMessage(f"Unknown websocket message: {message}")
+        return True

run.py

@@ -22,7 +22,7 @@ async def main():
         username=data["username"],
         password=data["password"],
     )
-    fleet = await cloud_client.get_customer_fleet()
+    # fleet = await cloud_client.get_customer_fleet()
 
     # serial = list(fleet.keys())[0]
 
@@ -52,8 +52,8 @@ async def main():
         model=MachineModel(data["model"]),
         serial_number=data["serial"],
         name=data["serial"],
-        # cloud_client=cloud_client,
-        local_client=local_client,
+        cloud_client=cloud_client,
+        # local_client=local_client,
     )
 
     await machine.websocket_connect()

setup.py

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

tests/__snapshots__/test_machine.ambr

@@ -20,3 +20,6 @@
     websocket_connected=False,
   )
 # ---
+# name: test_websocket_message
+  "LaMarzoccoMachineConfig(turned_on=True, doses={<PhysicalKey.A: 1>: 135, <PhysicalKey.B: 2>: 97, <PhysicalKey.C: 3>: 108, <PhysicalKey.D: 4>: 121}, boilers={<BoilerType.STEAM: 'SteamBoiler'>: LaMarzoccoBoiler(enabled=True, current_temperature=113, target_temperature=131), <BoilerType.COFFEE: 'CoffeeBoiler1'>: LaMarzoccoBoiler(enabled=True, current_temperature=81, target_temperature=94)}, prebrew_mode=<PrebrewMode.PREINFUSION: 'TypeB'>, plumbed_in=True, prebrew_configuration={<PhysicalKey.A: 1>: LaMarzoccoPrebrewConfiguration(on_time=0.5, off_time=1), <PhysicalKey.B: 2>: LaMarzoccoPrebrewConfiguration(on_time=0.5, off_time=1), <PhysicalKey.C: 3>: LaMarzoccoPrebrewConfiguration(on_time=3.299999952316284, off_time=3.299999952316284), <PhysicalKey.D: 4>: LaMarzoccoPrebrewConfiguration(on_time=2, off_time=2)}, dose_hot_water=8, water_contact=True, auto_on_off_schedule=LaMarzoccoSchedule(enabled=True, days={<WeekDay.MONDAY: 'monday'>: LaMarzoccoScheduleDay(enabled=True, h_on=6, h_off=16, m_on=0, m_off=0), <WeekDay.TUESDAY: 'tuesday'>: LaMarzoccoScheduleDay(enabled=True, h_on=6, h_off=16, m_on=0, m_off=0), <WeekDay.WEDNESDAY: 'wednesday'>: LaMarzoccoScheduleDay(enabled=True, h_on=6, h_off=16, m_on=0, m_off=0), <WeekDay.THURSDAY: 'thursday'>: LaMarzoccoScheduleDay(enabled=True, h_on=6, h_off=16, m_on=0, m_off=0), <WeekDay.FRIDAY: 'friday'>: LaMarzoccoScheduleDay(enabled=True, h_on=6, h_off=16, m_on=0, m_off=0), <WeekDay.SATURDAY: 'saturday'>: LaMarzoccoScheduleDay(enabled=True, h_on=6, h_off=16, m_on=0, m_off=0), <WeekDay.SUNDAY: 'sunday'>: LaMarzoccoScheduleDay(enabled=True, h_on=6, h_off=16, m_on=0, m_off=0)}), brew_active=False, brew_active_duration=0)"
+# ---

tests/test_machine.py

@@ -7,7 +7,7 @@
 
 from lmcloud.client_cloud import LaMarzoccoCloudClient
 from lmcloud.client_local import LaMarzoccoLocalClient
-from lmcloud.const import BoilerType, MachineModel, WeekDay
+from lmcloud.const import BoilerType, MachineModel, PhysicalKey, WeekDay
 from lmcloud.lm_machine import LaMarzoccoMachine
 
 from . import init_machine, MACHINE_SERIAL
@@ -71,12 +71,12 @@ async def test_set_prebrew_infusion(
             3.5,
         )
         assert result is True
-        assert machine.config.prebrew_configuration[1].on_time == 1.0
-        assert machine.config.prebrew_configuration[1].off_time == 3.5
+        assert machine.config.prebrew_configuration[PhysicalKey.A].on_time == 1.0
+        assert machine.config.prebrew_configuration[PhysicalKey.A].off_time == 3.5
 
         result = await machine.set_preinfusion_time(4.5)
         assert result is True
-        assert machine.config.prebrew_configuration[1].off_time == 4.5
+        assert machine.config.prebrew_configuration[PhysicalKey.A].off_time == 4.5
 
 
 async def test_set_schedule(
@@ -95,3 +95,22 @@ async def test_set_schedule(
             m_off=0,
         )
     assert result is True
+
+
+async def test_websocket_message(
+    cloud_client: LaMarzoccoCloudClient,
+    local_machine_client: LaMarzoccoLocalClient,
+    snapshot: SnapshotAssertion,
+):
+    """Test parsing of websocket messages."""
+    machine = await LaMarzoccoMachine.create(
+        model=MachineModel.GS3_AV,
+        serial_number=MACHINE_SERIAL,
+        name="MyMachine",
+        cloud_client=cloud_client,
+        local_client=local_machine_client,
+    )
+
+    message = r'[{"Boilers":"[{\"id\":\"SteamBoiler\",\"isEnabled\":true,\"target\":131,\"current\":113},{\"id\":\"CoffeeBoiler1\",\"isEnabled\":true,\"target\":94,\"current\":81}]"}]'
+    machine.on_websocket_message_received(message)
+    assert str(machine.config) == snapshot