python-swidget 1.3.2__tar.gz → 1.3.3__tar.gz

{python_swidget-1.3.2 → python_swidget-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-swidget
-Version: 1.3.2
+Version: 1.3.3
 Summary: Python API for Swidget smart devices
 License: GPL-3.0-or-later
 Author: Swidget
@@ -21,13 +21,13 @@ Requires-Dist: importlib-metadata
 Requires-Dist: m2r (>=0,<1) ; extra == "docs"
 Requires-Dist: mistune (<2.0.0) ; extra == "docs"
 Requires-Dist: pydantic (>=2,<3)
-Requires-Dist: requests (==2.32.3)
+Requires-Dist: requests (==2.32.5)
 Requires-Dist: sphinx (>=4,<5) ; extra == "docs"
 Requires-Dist: sphinx_rtd_theme (>=0,<1) ; extra == "docs"
 Requires-Dist: sphinxcontrib-programoutput (>=0,<1) ; extra == "docs"
 Requires-Dist: ssdp (==1.1.1)
-Requires-Dist: types-requests (>=2.3.0,<3.0.0)
-Requires-Dist: urllib3 (==1.26.5)
+Requires-Dist: types-requests (>=2.32.0,<3.0.0)
+Requires-Dist: urllib3 (==2.5.0)
 Project-URL: Repository, https://github.com/swidget/python-swidget
 Description-Content-Type: text/markdown
 

{python_swidget-1.3.2 → python_swidget-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-swidget"
-version = "1.3.2"
+version = "1.3.3"
 description = "Python API for Swidget smart devices"
 license = "GPL-3.0-or-later"
 authors = ["Swidget"]
@@ -22,9 +22,9 @@ importlib-metadata = "*"
 asyncclick = ">=8"
 pydantic = "^2"
 ssdp = "1.1.1"
-requests = "2.32.3"
-types-requests = "^2.3.0"
-urllib3 = '1.26.5'
+requests = "2.32.5"
+types-requests = "^2.32.0"
+urllib3 = '2.5.0'
 
 # required only for docs
 sphinx = { version = "^4", optional = true }

{python_swidget-1.3.2 → python_swidget-1.3.3}/swidget/discovery.py

@@ -31,12 +31,14 @@ class SwidgetDiscoveredDevice:
         host_type: str,
         insert_type: str,
         friendly_name: str = "Swidget Discovered Device",
+        host_id: str = "",
     ):
         self.mac = mac
         self.host = host
         self.friendly_name = friendly_name
         self.host_type = host_type
         self.insert_type = insert_type
+        self.host_id = host_id
 
 
 class SwidgetProtocol(ssdp.SimpleServiceDiscoveryProtocol):

{python_swidget-1.3.2 → python_swidget-1.3.3}/swidget/swidgetdevice.py

@@ -37,6 +37,8 @@ class InsertType(Enum):
     GL = "GUIDE LIGHT"
     PO = "POWER OUT"
     VIDEO = "video"  # This is not a mistake.
+    USBC = "USBC"
+    WD = "WATER DETECTOR"
     Unknown = -1
 
 
@@ -277,7 +279,7 @@ class SwidgetDevice:
         try:
             self.rssi = state["connection"]["rssi"]
         except Exception:
-            pass
+            self.rssi = 0
         for assembly in self.assemblies:
             for id, component in self.assemblies[assembly].components.items():
                 try:
@@ -544,6 +546,10 @@ class SwidgetDevice:
                 pass
             elif function == "sd":
                 return_values[function] = data["state"]
+            elif function == "water":
+                return_values[function] = data["state"]
+            elif function == "buzzer":
+                return_values[function] = data["mode"]
             else:
                 return_values[function] = data["now"]
         return return_values

{python_swidget-1.3.2 → python_swidget-1.3.3}/swidget/websocket.py

@@ -94,13 +94,13 @@ class SwidgetWebsocket:
             self.retry_count = 0
             _LOGGER.debug("Websocket now connected")
         except (ClientConnectionError, WSServerHandshakeError):
-            _LOGGER.error("Error connecting to websocket")
+            _LOGGER.exception("Error connecting to websocket")
             self._client = None
         except socket.gaierror as e:
             _LOGGER.error(f"Error resolving host: {e}")
             self._client = None
-        except Exception as e:
-            _LOGGER.error(f"An unexpected error occurred: {e}")
+        except Exception:
+            _LOGGER.exception("An unexpected error occurred.")
             self._client = None
 
     async def send_str(self, message: str) -> None:
@@ -126,7 +126,7 @@ class SwidgetWebsocket:
                         f"Failed to send message after {max_send_retries} attempts."
                     )
 
-    async def receive(self):
+    async def receive(self) -> Any | None:
         """Receive a message from the WebSocket server."""
         _LOGGER.debug("websocket.receive() called")
         try:
@@ -136,16 +136,17 @@ class SwidgetWebsocket:
                     message_data = message.json()
                     _LOGGER.debug(f"[{self.host}] Received message: {message_data}")
                     return message_data
-                elif message.type == WSMsgType.CLOSED:
-                    _LOGGER.error("Websocket client is closed")
+                elif message.type in (WSMsgType.CLOSED, WSMsgType.CLOSING):
+                    _LOGGER.error("Websocket connection is closed")
                     self._client = None
                 elif message.type == WSMsgType.ERROR:
                     _LOGGER.error("WebSocket error.")
                     self._client = None
         except Exception as e:
             _LOGGER.error(f"Error receiving message: {e}")
+        return None
 
-    async def close(self):
+    async def close(self) -> None:
         """Close the WebSocket connection."""
         _LOGGER.debug("websocket.close() called")
         self.is_running = False
@@ -156,15 +157,17 @@ class SwidgetWebsocket:
         if self.session and not self.session.closed:
             await self.session.close()
 
-    async def reconnect(self):
-        """Reconnect to the WebSocket server after a delay."""
+    async def reconnect(self) -> None:
+        """Attempt to reconnect to the WebSocket server, raising on failure."""
         _LOGGER.debug("websocket.reconnect() called")
         if self.max_retries is not None and self.retry_count >= self.max_retries:
-            _LOGGER.warning("Max retries reached. Stopping reconnect attempts.")
-            self.is_running = False
-            return
+            _LOGGER.error("Max retries reached. Stopping reconnect attempts.")
+            raise ConnectionError(
+                f"Max retries reached. Could not connect to {self.host}"
+            )
 
         self.retry_count += 1
+        # Implement exponential backoff for reconnection delay
         delay = self.retry_interval * (2 ** (self.retry_count - 1))
         _LOGGER.warning(
             f"Reconnecting to Swidget device: {self.host} in {delay} seconds (attempt {self.retry_count})..."
@@ -172,7 +175,7 @@ class SwidgetWebsocket:
         await asyncio.sleep(delay)
         await self.connect()
 
-    async def run(self):
+    async def run(self) -> None:
         """Run the WebSocket client to handle messages and reconnections."""
         while self.is_running:
             if self._client is None: