anycubic-cloud-api 0.4.5__tar.gz → 0.4.7__tar.gz

{anycubic_cloud_api-0.4.5/src/anycubic_cloud_api.egg-info → anycubic_cloud_api-0.4.7}/PKG-INFO

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

{anycubic_cloud_api-0.4.5 → anycubic_cloud_api-0.4.7}/pyproject.toml

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

{anycubic_cloud_api-0.4.5 → anycubic_cloud_api-0.4.7}/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.5 → anycubic_cloud_api-0.4.7}/src/anycubic_cloud_api/data_models/printer_properties.py

@@ -493,6 +493,10 @@ class AnycubicDryingStatus:
         )
 
 
+# `edit_status` on a slot: 0 read from a tag, 1 entered by hand, 2 empty.
+SPOOL_EDIT_STATUS_EMPTY = 2
+
+
 class AnycubicSpoolInfo:
     __slots__ = (
         "_index",
@@ -599,6 +603,22 @@ class AnycubicSpoolInfo:
     def edit_status(self) -> int:
         return self._edit_status
 
+    @property
+    def spool_present(self) -> bool:
+        """Whether there is actually a reel in this slot.
+
+        The ACE keeps reporting the last material, colour and SKU it saw in a
+        slot after the reel is taken out, so those fields say nothing about
+        whether anything is loaded. `edit_status` does: 0 means the details
+        were read from a tag, 1 that they were typed in, and 2 that the slot
+        is empty.
+
+        Confirmed on a Kobra S1 with one reel in slot 3 -- that slot alone
+        reported 0, and the three empty ones all reported 2 while still
+        showing the material they last held.
+        """
+        return self._edit_status != SPOOL_EDIT_STATUS_EMPTY
+
     @property
     def icon_type(self) -> int | None:
         return self._icon_type

{anycubic_cloud_api-0.4.5 → anycubic_cloud_api-0.4.7}/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.5 → anycubic_cloud_api-0.4.7/src/anycubic_cloud_api.egg-info}/PKG-INFO

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

{anycubic_cloud_api-0.4.5 → anycubic_cloud_api-0.4.7}/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.7/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