Gql 4 (#393)

* Gql 4

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

* Bump version to 0.36.0

---------

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

Author: Danielhiversen

pyproject.toml

@@ -19,7 +19,7 @@ classifiers = [
 ]
 dependencies = [
   "aiohttp>=3.0.6",
-  "gql==3.5.0",
+  "gql>=4.0.0",
   "websockets>=14.0.0",
 ]
 dynamic = ["version"]

tibber/const.py

@@ -3,7 +3,7 @@
 from http import HTTPStatus
 from typing import Final
 
-__version__ = "0.35.0"
+__version__ = "0.36.0"
 
 API_ENDPOINT: Final = "https://api.tibber.com/v1-beta/gql"
 DATA_API_ENDPOINT: Final = "https://data-api.tibber.com"

tibber/home.py

@@ -436,9 +436,9 @@ async def _start() -> None:
                 return
 
             try:
-                session = self._tibber_control.realtime.sub_manager.session
-                if not hasattr(session, "subscribe"):
-                    _LOGGER.error("Session does not support subscribe method")
+                session = self._tibber_control.realtime.session
+                if session is None or not hasattr(session, "subscribe"):
+                    _LOGGER.error("Session is not connected or does not support subscribe method")
                     return
                 async for _data in session.subscribe(
                     gql(LIVE_SUBSCRIBE % self.home_id),

tibber/realtime.py

@@ -39,6 +39,7 @@ def __init__(self, access_token: str, timeout: int, user_agent: str, ssl: SSLCon
         self._watchdog_running: bool = False
 
         self.sub_manager: Client | None = None
+        self.session: Any | None = None
 
     async def disconnect(self) -> None:
         """Stop subscription manager.
@@ -52,14 +53,10 @@ async def disconnect(self) -> None:
             self._watchdog_runner = None
         for home in self._homes:
             home.rt_unsubscribe()
-        if self.sub_manager is None:
-            return
-        try:
-            if not hasattr(self.sub_manager, "session"):
-                return
+        if self.session is not None:
             await self.sub_manager.close_async()
-        finally:
-            self.sub_manager = None
+            self.session = None
+        self.sub_manager = None
 
     async def connect(self) -> None:
         """Start subscription manager."""
@@ -74,7 +71,7 @@ async def connect(self) -> None:
                 _LOGGER.debug("Starting watchdog")
                 self._watchdog_running = True
                 self._watchdog_runner = asyncio.create_task(self._watchdog())
-            await self.sub_manager.connect_async()
+            self.session = await self.sub_manager.connect_async()
 
     def set_access_token(self, access_token: str) -> None:
         """Set access token."""
@@ -141,8 +138,9 @@ async def _watchdog(self) -> None:
             )
 
             try:
-                if hasattr(self.sub_manager, "session"):
+                if self.session is not None:
                     await self.sub_manager.close_async()
+                    self.session = None
             except Exception:
                 _LOGGER.exception("Error in watchdog close")
 
@@ -152,7 +150,7 @@ async def _watchdog(self) -> None:
 
             self._create_sub_manager()
             try:
-                await self.sub_manager.connect_async()
+                self.session = await self.sub_manager.connect_async()
                 await self._resubscribe_homes()
             except Exception as err:  # noqa: BLE001
                 delay_seconds = min(
@@ -193,7 +191,7 @@ def subscription_running(self) -> bool:
             self.sub_manager is not None
             and isinstance(self.sub_manager.transport, TibberWebsocketsTransport)
             and self.sub_manager.transport.running
-            and hasattr(self.sub_manager, "session")
+            and self.session is not None
         )
 
     @property

tibber/websocket_transport.py

@@ -36,7 +36,12 @@ def __init__(self, url: str, access_token: str, user_agent: str, ssl: SSLContext
     @property
     def running(self) -> bool:
         """Is real time subscription running."""
-        return hasattr(self, "websocket") and self.websocket is not None and self.websocket.state is State.OPEN
+        return (
+            hasattr(self, "adapter")
+            and hasattr(self.adapter, "websocket")
+            and self.adapter.websocket is not None
+            and self.adapter.websocket.state is State.OPEN
+        )
 
     async def _receive(self) -> str:
         """Wait the next message from the websocket connection."""