anycubic-cloud-api 0.4.4__tar.gz → 0.4.6__tar.gz

{anycubic_cloud_api-0.4.4/src/anycubic_cloud_api.egg-info → anycubic_cloud_api-0.4.6}/PKG-INFO

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

{anycubic_cloud_api-0.4.4 → anycubic_cloud_api-0.4.6}/pyproject.toml

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

{anycubic_cloud_api-0.4.4 → anycubic_cloud_api-0.4.6}/src/anycubic_cloud_api/api/base.py

@@ -356,7 +356,17 @@ class AnycubicAPIBase:
             try:
                 await self._get_user_token_with_access_token_with_retry()
             except AnycubicAuthError:
-                return False
+                # A web token is a JWT too, so one can be mistaken for a slicer
+                # token and sent to a login endpoint that will never accept it.
+                # Try it as a plain user token before declaring the credentials
+                # bad -- they may be perfectly good.
+                if self.anycubic_auth.retry_access_token_as_user_token():
+                    self._log_to_debug(
+                        "Access token login failed; retrying it as a web token."
+                    )
+                    self._tokens_changed = True
+                else:
+                    return False
         try:
             await self.get_user_info()
             return True

{anycubic_cloud_api-0.4.4 → anycubic_cloud_api-0.4.6}/src/anycubic_cloud_api/data_models/printer.py

@@ -1995,11 +1995,25 @@ class AnycubicPrinter:
 
     @property
     def primary_multi_color_box_loaded_slot(self) -> int | None:
-        if self.primary_multi_color_box:
-            slot = self.primary_multi_color_box.loaded_slot
-            # -1 means nothing is loaded; surface that as unknown rather than
-            # a slot number that doesn't exist.
-            return slot if slot is not None and slot >= 0 else None
+        box = self.primary_multi_color_box
+
+        if not box:
+            return None
+
+        slot = box.loaded_slot
+
+        # -1 means nothing is loaded; surface that as unknown rather than a
+        # slot number that doesn't exist.
+        if slot is not None and slot >= 0:
+            return slot
+
+        # Some printers leave the box-level field at -1 even mid-print, while
+        # still marking the feeding slot's own status as loaded. Observed on a
+        # Kobra S1 printing from slot 3. Without this the filament used by such
+        # a job cannot be charged to any spool.
+        for spool in box.slots or []:
+            if spool is not None and spool.spool_loaded:
+                return int(spool.slot_index)
 
         return None
 

{anycubic_cloud_api-0.4.4 → anycubic_cloud_api-0.4.6}/src/anycubic_cloud_api/models/auth.py

@@ -133,6 +133,27 @@ class AnycubicAuthentication:
             or self._auth_mode == AnycubicAuthMode.ANDROID
         )
 
+    def retry_access_token_as_user_token(self) -> bool:
+        """Treat a rejected slicer token as a web token instead.
+
+        Slicer and web tokens are both JWTs and cannot be told apart by
+        looking at them, so a web token can be taken for a slicer one. That
+        sends it to a login endpoint which answers "User does not exist", and
+        setup fails for a token that was perfectly good.
+
+        Rather than guess harder, the failure is used as the signal: move the
+        token back to being a plain user token and carry on as web. Returns
+        False if there is nothing left to try.
+        """
+        if self._auth_access_token is None or self._auth_token is not None:
+            return False
+
+        self._auth_token = self._auth_access_token
+        self._auth_access_token = None
+        self._auth_mode = AnycubicAuthMode.WEB
+
+        return True
+
     def set_auth_token(
         self,
         auth_token: str,

{anycubic_cloud_api-0.4.4 → anycubic_cloud_api-0.4.6/src/anycubic_cloud_api.egg-info}/PKG-INFO

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

{anycubic_cloud_api-0.4.4 → anycubic_cloud_api-0.4.6}/src/anycubic_cloud_api.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ src/anycubic_cloud_api/models/http.py
 src/anycubic_cloud_api/resources/anycubic_mqqt_tls_ca.crt
 src/anycubic_cloud_api/resources/anycubic_mqqt_tls_client.crt
 src/anycubic_cloud_api/resources/anycubic_mqqt_tls_client.key
+tests/test_auth_mode_fallback.py
 tests/test_axis_position.py
 tests/test_lan_client.py
 tests/test_lan_handshake.py

anycubic_cloud_api-0.4.6/tests/test_auth_mode_fallback.py

@@ -0,0 +1,66 @@
+"""A web token mistaken for a slicer token must still work.
+
+Reported by a user on a Kobra 2 Pro: a valid web token was rejected with
+"Authentication failed. Check credentials." Both kinds are JWTs, so the shape
+of the token cannot tell them apart -- the integration guessed slicer, sent it
+to a login endpoint that answered "User does not exist", and gave up.
+"""
+
+import pytest
+
+from anycubic_cloud_api.models.auth import AnycubicAuthentication, AnycubicAuthMode
+
+TOKEN = "eyJhbGciOiJSUzI1NiJ9.payload.signature"
+
+
+def slicer_auth():
+    """What set_authentication produces for a token guessed to be a slicer one."""
+    return AnycubicAuthentication(
+        auth_token=None,
+        auth_mode=AnycubicAuthMode.SLICER,
+        device_id=None,
+        auth_access_token=TOKEN,
+    )
+
+
+class TestRetryingAsAWebToken:
+    def test_a_rejected_slicer_token_becomes_a_web_token(self):
+        auth = slicer_auth()
+
+        assert auth.retry_access_token_as_user_token() is True
+        assert auth._auth_token == TOKEN
+        assert auth._auth_access_token is None
+        assert auth._auth_mode == AnycubicAuthMode.WEB
+
+    def test_it_no_longer_asks_for_an_access_token_login(self):
+        """Otherwise the caller would loop on the same failing endpoint."""
+        auth = slicer_auth()
+        assert auth.requires_access_token is True
+
+        auth.retry_access_token_as_user_token()
+
+        assert auth.requires_access_token is False
+
+    def test_it_only_fires_once(self):
+        auth = slicer_auth()
+
+        assert auth.retry_access_token_as_user_token() is True
+        assert auth.retry_access_token_as_user_token() is False
+
+    def test_a_genuine_web_token_has_nothing_to_retry(self):
+        auth = AnycubicAuthentication(
+            auth_token=TOKEN, auth_mode=AnycubicAuthMode.WEB,
+            device_id=None, auth_access_token=None,
+        )
+
+        assert auth.retry_access_token_as_user_token() is False
+
+    def test_an_android_token_is_left_alone(self):
+        """Android supplies a device id and is never ambiguous."""
+        auth = AnycubicAuthentication(
+            auth_token=TOKEN, auth_mode=AnycubicAuthMode.ANDROID,
+            device_id="device123", auth_access_token=None,
+        )
+
+        assert auth.retry_access_token_as_user_token() is False
+        assert auth._auth_mode == AnycubicAuthMode.ANDROID

{anycubic_cloud_api-0.4.4 → anycubic_cloud_api-0.4.6}/tests/test_lan_reports.py

@@ -479,3 +479,65 @@ class TestLevellingReadsAsLevelling:
 
     def test_an_unmapped_code_with_no_text_is_unknown(self):
         assert self._status(99) == "unknown"
+
+
+class TestLoadedSlotFallback:
+    """Some printers leave the box-level loaded_slot at -1 while printing.
+
+    Observed live on a Kobra S1 feeding from slot 3: the box reported -1, but
+    the slot's own status was 5 (loaded). Filament used by such a job could not
+    be charged to any spool, because attribution falls back on this value when
+    the job carries no per-slot breakdown.
+    """
+
+    def _printer(self, loaded_slot, statuses):
+        from unittest.mock import MagicMock
+        from anycubic_cloud_api.data_models.printer import AnycubicPrinter
+
+        slots = [
+            {
+                "index": i,
+                "sku": "",
+                "type": "PLA",
+                "color": [1, 2, 3],
+                "status": st,
+                "edit_status": 1,
+            }
+            for i, st in enumerate(statuses)
+        ]
+        return AnycubicPrinter(
+            api_parent=MagicMock(),
+            machine_type=20025,
+            machine_name="Kobra S1",
+            id=1,
+            multi_color_box=[{"id": 0, "box_id": 0, "loaded_slot": loaded_slot, "slots": slots}],
+            ignore_init_errors=True,
+        )
+
+    def test_the_box_level_field_is_preferred_when_it_is_set(self):
+        printer = self._printer(1, [4, 5, 4, 4])
+
+        assert printer.primary_multi_color_box_loaded_slot == 1
+
+    def test_minus_one_falls_back_to_the_slot_marked_loaded(self):
+        """The live case: box says -1, slot 2 says status 5."""
+        printer = self._printer(-1, [4, 4, 5, 4])
+
+        assert printer.primary_multi_color_box_loaded_slot == 2
+
+    def test_nothing_loaded_still_reads_as_unknown(self):
+        printer = self._printer(-1, [4, 4, 4, 4])
+
+        assert printer.primary_multi_color_box_loaded_slot is None
+
+    def test_a_box_with_no_slots_is_harmless(self):
+        from unittest.mock import MagicMock
+        from anycubic_cloud_api.data_models.printer import AnycubicPrinter
+
+        printer = AnycubicPrinter(
+            api_parent=MagicMock(), machine_type=20025, machine_name="x", id=1,
+            multi_color_box=[{"id": 0, "box_id": 0, "loaded_slot": -1, "slots": []}],
+            ignore_init_errors=True,
+        )
+
+        assert printer.primary_multi_color_box_loaded_slot is None