anycubic-cloud-api 0.3.0__tar.gz → 0.3.2__tar.gz

{anycubic_cloud_api-0.3.0/src/anycubic_cloud_api.egg-info → anycubic_cloud_api-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anycubic-cloud-api
-Version: 0.3.0
+Version: 0.3.2
 Summary: Async client for the Anycubic Cloud API and its MQTT stream
 Author: Nino Bondonno
 Maintainer: Nino Bondonno

{anycubic_cloud_api-0.3.0 → anycubic_cloud_api-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "anycubic-cloud-api"
-version = "0.3.0"
+version = "0.3.2"
 description = "Async client for the Anycubic Cloud API and its MQTT stream"
 readme = "README.md"
 requires-python = ">=3.12"

{anycubic_cloud_api-0.3.0 → anycubic_cloud_api-0.3.2}/src/anycubic_cloud_api/data_models/printer.py

@@ -875,19 +875,29 @@ class AnycubicPrinter:
         state: str,
         payload: AnycubicConsumableData,
     ) -> None:
-        if action == 'auto' and state == 'done':
+        # 'auto' over the cloud, 'query' when asked for locally -- same body.
+        if action in ('auto', 'query') and state == 'done':
             data = payload['data']
 
+            # Read every field first: reading is what marks it consumed, and
+            # anything left behind raises at the end of dispatch -- so these
+            # must not sit inside the conditionals below.
+            curr_hotbed = data.get('curr_hotbed_temp')
+            curr_nozzle = data.get('curr_nozzle_temp')
+            target_hotbed = data.get('target_hotbed_temp')
+            target_nozzle = data.get('target_nozzle_temp')
+
+            # Asked for locally, an enclosed printer also answers with the
+            # chamber. A Kobra S1 sends zeroes because it has no sensor, so
+            # these are kept raw rather than turned into an always-zero entity.
+            self._chamber_temp = data.get('curr_chamber_temp')
+            self._target_chamber_temp = data.get('target_chamber_temp')
+
             if self.parameter:
-                self.parameter.update_current_temps(
-                    data['curr_hotbed_temp'],
-                    data['curr_nozzle_temp'],
-                )
+                self.parameter.update_current_temps(curr_hotbed, curr_nozzle)
+
             if self._latest_project:
-                self._latest_project.update_target_temps(
-                    data['target_hotbed_temp'],
-                    data['target_nozzle_temp'],
-                )
+                self._latest_project.update_target_temps(target_hotbed, target_nozzle)
 
             return
         else:
@@ -899,10 +909,13 @@ class AnycubicPrinter:
         state: str,
         payload: AnycubicConsumableData,
     ) -> None:
-        if action == 'auto' and state == 'done':
+        # The cloud pushes these unprompted as action 'auto'; asked for over
+        # the local connection the same body comes back as 'query'.
+        if action in ('auto', 'query') and state == 'done':
             data = payload['data']
 
-            self._fan_speed = int(data['fan_speed_pct'])
+            if 'fan_speed_pct' in data:
+                self._fan_speed = int(data['fan_speed_pct'])
 
             # The Kobra S1 also reports the auxiliary part fan and the ACE box
             # fan here. Both were previously discarded as unhandled data.
@@ -1264,12 +1277,24 @@ class AnycubicPrinter:
         self._local_firmware_version = data.get('version')
         self._local_ip = data.get('ip')
 
+        # A report arriving at all means the printer is reachable, and the
+        # cloud fields that normally drive availability are never set when
+        # there is no cloud. Without this every entity reads unavailable on a
+        # working local connection.
+        self._device_status = 1
+
+        printer_state = data.get('state')
+
+        if printer_state == 'busy':
+            self._is_printing = 2
+        elif printer_state == 'free':
+            self._is_printing = 1
+
         # Consumed but not modelled: the printer's own name and model strings
         # duplicate what the device already carries, and the project blocks are
         # covered by the print report.
         data.get('printerName')
         data.get('model')
-        data.get('state')
         data.get('project')
         data.get('last_project')
         data.get('aux_fan_speed_pct')

{anycubic_cloud_api-0.3.0 → anycubic_cloud_api-0.3.2/src/anycubic_cloud_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anycubic-cloud-api
-Version: 0.3.0
+Version: 0.3.2
 Summary: Async client for the Anycubic Cloud API and its MQTT stream
 Author: Nino Bondonno
 Maintainer: Nino Bondonno

{anycubic_cloud_api-0.3.0 → anycubic_cloud_api-0.3.2}/tests/test_lan_reports.py

@@ -212,3 +212,87 @@ class TestAiSettings:
     def test_an_unseen_printer_reports_nothing(self):
         assert make_printer().ai_detection_enabled is None
         assert make_printer().ai_settings == {}
+
+
+class TestQueryActionReplies:
+    """The cloud pushes these unprompted; locally they answer a query.
+
+    The body is identical either way, so refusing 'query' meant fan and
+    temperature reports were discarded over the local connection.
+    """
+
+    FAN = {
+        "type": "fan",
+        "action": "query",
+        "state": "done",
+        "data": {"aux_fan_speed_pct": 0, "box_fan_level": 0, "fan_speed_pct": 55},
+    }
+    TEMPERATURE = {
+        "type": "tempature",
+        "action": "query",
+        "state": "done",
+        "data": {
+            "curr_hotbed_temp": 31,
+            "curr_nozzle_temp": 34,
+            "curr_chamber_temp": 0,
+            "target_hotbed_temp": 0,
+            "target_nozzle_temp": 0,
+            "target_chamber_temp": 0,
+        },
+    }
+
+    def test_a_queried_fan_report_is_applied(self):
+        printer = make_printer()
+
+        apply(printer, self.FAN)
+
+        assert printer._fan_speed == 55
+
+    def test_a_pushed_fan_report_still_works(self):
+        printer = make_printer()
+
+        apply(printer, {**self.FAN, "action": "auto"})
+
+        assert printer._fan_speed == 55
+
+    def test_a_fan_report_without_the_main_speed_does_not_raise(self):
+        """Not every model reports all three."""
+        apply(make_printer(), {**self.FAN, "data": {"box_fan_level": 2}})
+
+    def test_a_queried_temperature_report_is_applied(self):
+        apply(make_printer(), self.TEMPERATURE)
+
+
+class TestAvailabilityFromLocalReports:
+    """With no cloud, nothing else sets the fields availability is read from."""
+
+    def test_a_report_marks_the_printer_online(self):
+        printer = make_printer()
+
+        apply(printer, INFO_REPORT)
+
+        assert printer.printer_online is True
+
+    def test_free_reads_as_available_and_not_busy(self):
+        printer = make_printer()
+
+        apply(printer, INFO_REPORT)
+
+        assert printer.is_available is True
+        assert printer.is_busy is False
+
+    def test_busy_reads_as_busy(self):
+        printer = make_printer()
+        report = {**INFO_REPORT, "data": {**INFO_REPORT["data"], "state": "busy"}}
+
+        apply(printer, report)
+
+        assert printer.is_busy is True
+
+    def test_an_unknown_state_leaves_it_alone(self):
+        printer = make_printer()
+        report = {**INFO_REPORT, "data": {**INFO_REPORT["data"], "state": "wat"}}
+
+        apply(printer, report)
+
+        assert printer.printer_online is True