python-siseli 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

{python_siseli-0.1.0.dist-info → python_siseli-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-siseli
-Version: 0.1.0
+Version: 0.1.2
 Summary: Python SDK for Siseli Cloud
 License: MIT
 Requires-Python: >=3.11

{python_siseli-0.1.0.dist-info → python_siseli-0.1.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 siseli/__init__.py,sha256=_sHO0M0medXnJz_ZTtHKyy8DP6e40wuf5ubEGLC1kBs,1035
 siseli/_utils.py,sha256=QT-ooemKKAIEHICNI2QErPvRkFIkUGo6ncUFCJM1kGc,727
 siseli/alarms.py,sha256=Mc_CV8kUBFTXu8c48NstX8Lc6Q0bPTnhjwehx9sbCkQ,4853
-siseli/auth.py,sha256=L-aT_R9CQDrnwx6uiGR4aYaEdb3ky2DFQgqkW0x5cEM,3356
+siseli/auth.py,sha256=I8WwJgy1go1MGxjowkVx-lvCtneh5rRtbs9DV9yO4T8,6470
 siseli/client.py,sha256=Eap7MTrnctdskt6kOzbns7SqUt27ZDjMlIKVshfcfN8,14200
 siseli/config.py,sha256=J8raq7Yf4gCyjO9ISNoTrk_EYNEGrESV56O-aHfDvBU,3278
 siseli/const.py,sha256=M8bBrc8cH0OyEGb9158_emux_dfknvikGQqm09iQ8CA,174
 siseli/dashboard.py,sha256=JQHfi8orKs5uWsGGfoTvA14A9M_R9yIAYuGCxb4zTsM,3325
 siseli/device.py,sha256=crix14pYakrDaFmomPC3Uwgdq-1boZ-ZaEg2HgzXibs,2762
 siseli/dictionary.py,sha256=VSO83uXPaGLPzKGRmpROuWQKivXN7DNOmXN8QQJ-Y-w,1120
-siseli/exceptions.py,sha256=Y34NlvH8Lx1Hf1tQY8rlmbtEElR9TCq-RmH5zrj9b3A,757
+siseli/exceptions.py,sha256=y9ws9c2vr5Q3bZxLwkXybUqQooq57YEEXAN0wO3_fxk,1420
 siseli/history.py,sha256=CgBvDfZBIrrewu7PeRv08-Zr4boEVOY8Xevruu-ge-I,3869
 siseli/state.py,sha256=d7Exlf7FzF8O_CcF-NbAt6kq8qaR4fFhjGW8028kbrM,5800
 siseli/station.py,sha256=e1OK4OIry9WUjT8KggQI5b4Acypm9D31mWAMTjDGFew,5531
@@ -23,7 +23,7 @@ siseli/models/dictionary.py,sha256=d6KCu77UMlPcIDON8G3sjuytkSfbI5go1y3I_jAGTX8,4
 siseli/models/history.py,sha256=dx26VWLJosucMvwL36vojvAguvkMiv5GEKTllUtZV0Y,791
 siseli/models/state.py,sha256=VK5CNqMLRkY1w9HrcUhvaO_6J-rjqP7VwvbppCFpucI,2393
 siseli/models/station.py,sha256=02OLINAVblnKkF73ZwKxYvPtUFROsu4-g544oDg8ApA,1783
-python_siseli-0.1.0.dist-info/METADATA,sha256=6ie6JBHG1D8xEGY9afztyw-LaAVSM9Zn2y0LK8BZPRg,1407
-python_siseli-0.1.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-python_siseli-0.1.0.dist-info/top_level.txt,sha256=Dofr9c7hGvRRV6ij6aoPuAZqxEjkgtsBeN4KtFHbGgo,7
-python_siseli-0.1.0.dist-info/RECORD,,
+python_siseli-0.1.2.dist-info/METADATA,sha256=xnZJLpywI8nzDQEqwUgUsN9Pbx5iL7bnSqV3v326MFs,1407
+python_siseli-0.1.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_siseli-0.1.2.dist-info/top_level.txt,sha256=Dofr9c7hGvRRV6ij6aoPuAZqxEjkgtsBeN4KtFHbGgo,7
+python_siseli-0.1.2.dist-info/RECORD,,

siseli/auth.py

@@ -3,13 +3,16 @@
 from __future__ import annotations
 
 import hashlib
+import logging
 from datetime import UTC, datetime
 
 import httpx
 
-from .exceptions import AuthenticationError
+from .exceptions import AuthenticationError, NetworkError
 from .models.auth import TokenInfo
 
+_LOGGER = logging.getLogger(__name__)
+
 
 def _md5(text: str) -> str:
     # The Siseli Cloud API requires the MD5 hash of the plaintext password.
@@ -25,6 +28,28 @@ def _parse_dt(value: str | None) -> datetime | None:
     return datetime.fromisoformat(value.replace("Z", "+00:00"))
 
 
+def _extract_api_message(response: httpx.Response) -> str | None:
+    """Extract a safe, short error message from an HTTP error response.
+
+    Tries to parse the body as JSON and returns the value of the first
+    recognised error field (``error``, ``message``, ``detail``).  Falls back
+    to the first 200 characters of the raw text body so there is always
+    *something* useful in logs.  Never returns passwords, tokens, or auth
+    headers — those are never present in response bodies.
+    """
+    try:
+        body = response.json()
+        if isinstance(body, dict):
+            for key in ("error", "message", "detail"):
+                value = body.get(key)
+                if value and isinstance(value, str):
+                    return value[:200]
+    except Exception:  # noqa: BLE001
+        pass
+    text = (response.text or "").strip()
+    return text[:200] if text else None
+
+
 class Auth:
     """Manages credentials and the current access token.
 
@@ -41,21 +66,68 @@ class Auth:
     async def login(self, http: httpx.AsyncClient) -> TokenInfo:
         """Authenticate and store the returned tokens.
 
-        Raises :exc:`~siseli.exceptions.AuthenticationError` on failure.
+        Raises :exc:`~siseli.exceptions.AuthenticationError` on HTTP-level
+        auth failures (4xx).  Raises :exc:`~siseli.exceptions.NetworkError`
+        on network / timeout errors so callers can distinguish the two cases.
         """
+        endpoint = "/apis/login/account"
+        _LOGGER.debug("Siseli auth: POST %s (account=%r)", endpoint, self._account)
+
         try:
             response = await http.post(
-                "/apis/login/account",
+                endpoint,
                 json={"account": self._account, "password": self._password_hash},
             )
-            response.raise_for_status()
+        except httpx.TimeoutException as exc:
+            _LOGGER.warning("Siseli auth: request timed out for account=%r", self._account)
+            raise NetworkError(f"Login request timed out: {exc}") from exc
         except httpx.HTTPError as exc:
-            raise AuthenticationError(f"Login request failed: {exc}") from exc
+            _LOGGER.warning(
+                "Siseli auth: network error for account=%r: %s", self._account, exc
+            )
+            raise NetworkError(f"Login request failed: {exc}") from exc
+
+        http_status = response.status_code
+        _LOGGER.debug(
+            "Siseli auth: response status=%d for account=%r", http_status, self._account
+        )
+
+        # For HTTP error responses, extract a safe diagnostic message and raise
+        # AuthenticationError (4xx) or NetworkError (5xx).
+        if not response.is_success:
+            api_message = _extract_api_message(response)
+            _LOGGER.warning(
+                "Siseli auth: failed for account=%r — HTTP %d%s",
+                self._account,
+                http_status,
+                f", api_message={api_message!r}" if api_message else "",
+            )
+            diag = f"HTTP {http_status}"
+            if api_message:
+                diag = f"{diag}: {api_message}"
+            if http_status >= 500:
+                raise NetworkError(f"Login request failed: {diag}")
+            raise AuthenticationError(
+                f"Login failed: {diag}",
+                http_status=http_status,
+                api_message=api_message,
+            )
 
         body = response.json()
         if body.get("code") != 0:
+            api_message = body.get("message") or body.get("error") or body.get("detail")
+            if api_message:
+                api_message = str(api_message)
+            _LOGGER.warning(
+                "Siseli auth: API returned non-zero code=%r for account=%r, message=%r",
+                body.get("code"),
+                self._account,
+                api_message,
+            )
             raise AuthenticationError(
-                f"Login failed (code {body.get('code')}): {body.get('message')}"
+                f"Login failed (code {body.get('code')}): {api_message}",
+                http_status=http_status,
+                api_message=api_message,
             )
 
         data = body["data"]
@@ -68,6 +140,7 @@ class Auth:
             account=data.get("account", self._account),
             user_id=data.get("userId", ""),
         )
+        _LOGGER.debug("Siseli auth: login successful for account=%r", self._account)
         return self._token_info
 
     @property

siseli/exceptions.py

@@ -8,7 +8,26 @@ class SiseliError(Exception):
 
 
 class AuthenticationError(SiseliError):
-    """Raised when authentication fails."""
+    """Raised when authentication fails.
+
+    Attributes:
+        http_status: HTTP status code returned by the server, or *None* when
+            the failure occurred before a response was received.
+        api_message: Short error message extracted from the API response body
+            (e.g. the ``message`` or ``error`` field), or *None* when
+            unavailable.  Never contains passwords, tokens, or other secrets.
+    """
+
+    def __init__(
+        self,
+        message: str,
+        *,
+        http_status: int | None = None,
+        api_message: str | None = None,
+    ) -> None:
+        self.http_status = http_status
+        self.api_message = api_message
+        super().__init__(message)
 
 
 class TokenExpiredError(AuthenticationError):