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

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

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: python-swidget
-Version: 1.3.0
+Version: 1.3.2
 Summary: Python API for Swidget smart devices
-Home-page: https://github.com/swidget/python-swidget
 License: GPL-3.0-or-later
 Author: Swidget
 Requires-Python: >=3.8,<4.0
@@ -21,13 +20,13 @@ Requires-Dist: asyncclick (>=8)
 Requires-Dist: importlib-metadata
 Requires-Dist: m2r (>=0,<1) ; extra == "docs"
 Requires-Dist: mistune (<2.0.0) ; extra == "docs"
-Requires-Dist: pydantic (>=1,<2)
+Requires-Dist: pydantic (>=2,<3)
 Requires-Dist: requests (==2.32.3)
 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.31.0.6)
+Requires-Dist: types-requests (>=2.3.0,<3.0.0)
 Requires-Dist: urllib3 (==1.26.5)
 Project-URL: Repository, https://github.com/swidget/python-swidget
 Description-Content-Type: text/markdown

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-swidget"
-version = "1.3.0"
+version = "1.3.2"
 description = "Python API for Swidget smart devices"
 license = "GPL-3.0-or-later"
 authors = ["Swidget"]
@@ -20,10 +20,10 @@ aiohttp = ">=3.8.1"
 anyio = "*"  # see https://github.com/python-trio/asyncclick/issues/18
 importlib-metadata = "*"
 asyncclick = ">=8"
-pydantic = "^1"
+pydantic = "^2"
 ssdp = "1.1.1"
 requests = "2.32.3"
-types-requests = "2.31.0.6"
+types-requests = "^2.3.0"
 urllib3 = '1.26.5'
 
 # required only for docs

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

@@ -6,7 +6,7 @@ import time
 from collections.abc import Callable
 from enum import Enum
 from types import TracebackType
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 from aiohttp import ClientSession, TCPConnector
 
@@ -98,11 +98,11 @@ class SwidgetDevice:
         """Property to represent if the client is connected to the device."""
         return self._websocket.connected
 
-    def get_websocket(self) -> SwidgetWebsocket | None:
+    def get_websocket(self) -> Optional[SwidgetWebsocket]:
         """Return the SwidgetWebsocket class instance if possible."""
         if self.use_websockets:
             return self._websocket
-        return None
+        raise RuntimeError("Swidget instance is not configured to use websockets")
 
     def set_countdown_timer(self, minutes) -> Any:
         """Set the countdown timer."""

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

@@ -27,7 +27,7 @@ class SwidgetWebsocket:
         session: aiohttp.ClientSession | None = None,
         use_security: bool = True,
         retry_interval: int = 30,  # Initial retry interval in seconds
-        max_retries: int = 200,  # Maximum number of reconnection attempts
+        max_retries: int | None = None,  # Maximum number of reconnection attempts
     ):
         """Initialize the SwidgetWebsocket.
 
@@ -93,8 +93,8 @@ class SwidgetWebsocket:
             )
             self.retry_count = 0
             _LOGGER.debug("Websocket now connected")
-        except (ClientConnectionError, WSServerHandshakeError) as e:
-            _LOGGER.error(f"Error connecting to websocket: {e}")
+        except (ClientConnectionError, WSServerHandshakeError):
+            _LOGGER.error("Error connecting to websocket")
             self._client = None
         except socket.gaierror as e:
             _LOGGER.error(f"Error resolving host: {e}")
@@ -167,7 +167,7 @@ class SwidgetWebsocket:
         self.retry_count += 1
         delay = self.retry_interval * (2 ** (self.retry_count - 1))
         _LOGGER.warning(
-            f"Reconnecting in {delay} seconds (attempt {self.retry_count})..."
+            f"Reconnecting to Swidget device: {self.host} in {delay} seconds (attempt {self.retry_count})..."
         )
         await asyncio.sleep(delay)
         await self.connect()