python-swidget 1.4.4__tar.gz → 1.4.6__tar.gz

{python_swidget-1.4.4 → python_swidget-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-swidget
-Version: 1.4.4
+Version: 1.4.6
 Summary: Python API for Swidget smart devices
 Home-page: https://github.com/swidget/python-swidget
 License: GPL-3.0-or-later

{python_swidget-1.4.4 → python_swidget-1.4.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-swidget"
-version = "1.4.4"
+version = "1.4.6"
 description = "Python API for Swidget smart devices"
 license = "GPL-3.0-or-later"
 authors = ["Swidget"]

{python_swidget-1.4.4 → python_swidget-1.4.6}/swidget/swidgetdevice.py

@@ -249,7 +249,9 @@ class SwidgetDevice:
             raise ValueError(f"Unsupported HTTP method: {http_method}")
 
         url = f"{self.uri_scheme}://{self.ip_address}/api/v1/{endpoint}"
-        _LOGGER.debug(f"Sending {http_method} request to: {url}")
+        _LOGGER.debug(
+            f"HTTP {http_method} {url} params={params} body={json_payload}"
+        )
 
         try:
             async with self._session.request(
@@ -261,14 +263,22 @@ class SwidgetDevice:
             ) as response:
                 if response.status == 200:
                     if response.content_length == 0:
+                        _LOGGER.debug(
+                            f"HTTP {response.status} {url} (empty body)"
+                        )
                         return {}
-                    return await response.json()
+                    body = await response.json()
+                    _LOGGER.debug(f"HTTP {response.status} {url} body={body}")
+                    return body
                 elif response.status == 403:
                     _LOGGER.error(
                         f"Authentication failed for {http_method} '{endpoint}'"
                     )
                     raise SwidgetAuthenticationException
                 else:
+                    _LOGGER.debug(
+                        f"HTTP {response.status} {url} (non-success)"
+                    )
                     response.raise_for_status()
                 return {}
         except ClientConnectorError as e:
@@ -722,8 +732,8 @@ class SwidgetDevice:
 
     @property
     def is_outlet(self) -> bool:
-        """Return True if the device is an outlet."""
-        return self.device_type == DeviceType.Outlet
+        """Return True if the device is an outlet (any variant)."""
+        return self.device_type in (DeviceType.Outlet, DeviceType.Outlet20A)
 
     @property
     def is_switch(self) -> bool:

{python_swidget-1.4.4 → python_swidget-1.4.6}/swidget/websocket.py

@@ -107,7 +107,7 @@ class SwidgetWebsocket:
 
     async def send_str(self, message: str) -> None:
         """Send a string message through the websocket with retry attempts."""
-        _LOGGER.debug("websocket.send_str() called")
+        _LOGGER.debug(f"[{self.host}] websocket.send_str: {message}")
         max_send_retries = 3
         for attempt in range(max_send_retries):
             try:
@@ -139,13 +139,24 @@ class SwidgetWebsocket:
                     _LOGGER.debug(f"[{self.host}] Received message: {message_data}")
                     return message_data
                 elif message.type in (WSMsgType.CLOSED, WSMsgType.CLOSING):
-                    _LOGGER.error("Websocket connection is closed")
+                    # message.data carries the close code (int) when present;
+                    # message.extra carries the reason string. close_code on
+                    # the client also reflects the final negotiated code.
+                    _LOGGER.error(
+                        f"[{self.host}] Websocket closed "
+                        f"(type={message.type.name}, "
+                        f"code={message.data!r}, "
+                        f"reason={message.extra!r}, "
+                        f"client.close_code={getattr(self._client, 'close_code', None)!r})"
+                    )
                     self._client = None
                 elif message.type == WSMsgType.ERROR:
-                    _LOGGER.error("WebSocket error.")
+                    _LOGGER.error(
+                        f"[{self.host}] Websocket error: {message.data!r}"
+                    )
                     self._client = None
         except Exception as e:
-            _LOGGER.error(f"Error receiving message: {e}")
+            _LOGGER.error(f"Error receiving message: {e}", exc_info=True)
         return None
 
     async def close(self) -> None: