livisi 0.0.19__py3-none-any.whl → 0.0.21__py3-none-any.whl

livisi/__init__.py

@@ -1,4 +1,4 @@
 from .aiolivisi import AioLivisi
 from .websocket import Websocket
 from .errors import IncorrectIpAddressException, WrongCredentialException, ShcUnreachableException, LivisiException
-from .livisi_event import LivisiEvent
+from .livisi_event import LivisiEvent

livisi/livisi_event.py

@@ -1,10 +1,9 @@
 from dataclasses import dataclass
-from pydantic import BaseModel
 from typing import Optional
 
 
-@dataclass(init=False)
-class LivisiEvent(BaseModel):
+@dataclass
+class LivisiEvent:
     namespace: str
     properties: Optional[dict]
     source: str

livisi/websocket.py

@@ -3,11 +3,11 @@ from typing import Callable
 import urllib.parse
 
 import websockets
-from pydantic import ValidationError
+import json
 
-from aiolivisi.livisi_event import LivisiEvent
+from livisi.livisi_event import LivisiEvent
 
-from .aiolivisi import AioLivisi
+from livisi import AioLivisi
 from .const import (
     AVATAR_PORT,
     IS_REACHABLE,
@@ -30,18 +30,18 @@ from .const import (
 class Websocket:
     """Represents the websocket class."""
 
-    def __init__(self, aiolivisi: AioLivisi) -> None:
+    def __init__(self, livisi: AioLivisi) -> None:
         """Initialize the websocket."""
-        self.aiolivisi = aiolivisi
+        self.livisi = livisi
         self.connection_url: str = None
 
     async def connect(self, on_data, on_close, port: int) -> None:
         """Connect to the socket."""
         if port == AVATAR_PORT:
-            token = urllib.parse.quote(self.aiolivisi.token)
+            token = urllib.parse.quote(self.livisi.token)
         else:
-            token = self.aiolivisi.token
-        ip_address = self.aiolivisi.livisi_connection_data["ip_address"]
+            token = self.livisi.token
+        ip_address = self.livisi.livisi_connection_data["ip_address"]
         self.connection_url = f"ws://{ip_address}:{port}/events?token={token}"
         try:
             async with websockets.connect(
@@ -65,14 +65,20 @@ class Websocket:
         """Used when data is transmited using the websocket."""
         async for message in websocket:
             try:
-                event_data = LivisiEvent.parse_raw(message)
-            except ValidationError:
+                parsed_json = json.loads(message)
+                # Only include keys that are fields in the LivisiEvent dataclass
+                event_data_dict = {
+                    f.name: parsed_json.get(f.name)
+                    for f in fields(LivisiEvent)
+                }
+                event_data = LivisiEvent(**event_data_dict)
+            except json.JSONDecodeError:
+                continue
+            if event_data.properties is None:
                 continue
 
             if "device" in event_data.source:
                 event_data.source = event_data.source.replace("/device/", "")
-            if event_data.properties is None:
-                continue
 
             if event_data.type == EVENT_STATE_CHANGED:
                 if ON_STATE in event_data.properties.keys():

{livisi-0.0.19.dist-info → livisi-0.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livisi
-Version: 0.0.19
+Version: 0.0.21
 Summary: Connection library for the abandoned Livisi Smart Home system
 Author-email: Stefan Iacob <stefan.iacob.extern@livisi.de>, Felix Rotthowe <felix@planbnet.org>
 License:                                  Apache License

livisi-0.0.21.dist-info/RECORD

@@ -0,0 +1,11 @@
+livisi/__init__.py,sha256=WfjrI1lKksaRhrL8vgN7rOWmmHvA1cxVcXrmdd3TSAc,220
+livisi/aiolivisi.py,sha256=kOqeNa-dg3d5lApd-_wzbw43dkD5UjPcf7m_QvQAHeg,9539
+livisi/const.py,sha256=1JaKhrRSwevc8mWwiTONEITVFJEOGjysDvUHTazF3T0,1088
+livisi/errors.py,sha256=ys6cS5yNGXPmJbU9BtUBuhlWqaKkcGSsnie8HMVnvDU,540
+livisi/livisi_event.py,sha256=Z3VN1nW737O1xMt1yj62lC0KTiiXFIlRPEog33IsJpw,456
+livisi/websocket.py,sha256=D2z7zP-hYkEtQTWFW01l4CRSGCEp7MUVSBNiwjTaVGI,4452
+livisi-0.0.21.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+livisi-0.0.21.dist-info/METADATA,sha256=o3l_pisspoT_0Z4B6DjAwhpLtNKcGyrPcQW9pk__zCo,13832
+livisi-0.0.21.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+livisi-0.0.21.dist-info/top_level.txt,sha256=ctiU5MMpBSwoQR7mJWIuyB1ND1_g004Xa3vNmMsSiCs,7
+livisi-0.0.21.dist-info/RECORD,,

livisi-0.0.19.dist-info/RECORD

@@ -1,11 +0,0 @@
-livisi/__init__.py,sha256=e-7-FaNhioPB18drtbyLaLDfy7XHCZf_QQP42TpBORw,219
-livisi/aiolivisi.py,sha256=kOqeNa-dg3d5lApd-_wzbw43dkD5UjPcf7m_QvQAHeg,9539
-livisi/const.py,sha256=1JaKhrRSwevc8mWwiTONEITVFJEOGjysDvUHTazF3T0,1088
-livisi/errors.py,sha256=ys6cS5yNGXPmJbU9BtUBuhlWqaKkcGSsnie8HMVnvDU,540
-livisi/livisi_event.py,sha256=vgP4Ol8OcAt54xpgL0gwov9MsIDxrIqb3ODIOwD8UQU,510
-livisi/websocket.py,sha256=YEjRvSI9JHGxCPOIXke6_muW73Ar5GIQ6y8xIlEY03w,4211
-livisi-0.0.19.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-livisi-0.0.19.dist-info/METADATA,sha256=rSuj4eHMLvdmVxawkOOmshQzoEsXBX5OSEF_BuFuB5o,13832
-livisi-0.0.19.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-livisi-0.0.19.dist-info/top_level.txt,sha256=ctiU5MMpBSwoQR7mJWIuyB1ND1_g004Xa3vNmMsSiCs,7
-livisi-0.0.19.dist-info/RECORD,,