Support latest gql (#375)

* Support latest gql

Signed-off-by: Daniel Hjelseth Høyer <[email protected]>

* format

Signed-off-by: Daniel Hjelseth Høyer <[email protected]>

* format

Signed-off-by: Daniel Hjelseth Høyer <[email protected]>

* format

Signed-off-by: Daniel Hjelseth Høyer <[email protected]>

* Update tibber/realtime.py

Co-authored-by: Copilot <[email protected]>

* format

Signed-off-by: Daniel Hjelseth Høyer <[email protected]>

---------

Signed-off-by: Daniel Hjelseth Høyer <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: Danielhiversen

.github/workflows/code_checker.yml

@@ -38,3 +38,36 @@ jobs:
       - name: pytest
         run: |
             pytest
+
+  validate-gql-350:
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        python-version:
+          - "3.12"
+          - "3.13"
+    env:
+      SRC_FOLDER: tibber
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+
+      - name: Install dependency with gql==3.5.0
+        run: |
+            pip install -r requirements.txt
+            pip install gql==3.5.0
+            pip install mypy pre-commit pytest pytest-asyncio pytest-cov ruff
+      - uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Run pre-commit
+        run: pre-commit run --all-files --show-diff-on-failure --color=always
+        shell: bash
+      - name: pytest
+        run: |
+            pytest

tibber/home.py

@@ -382,7 +382,7 @@ def current_price_data(self) -> tuple[float | None, dt.datetime | None, float |
                 return round(price_total, 3), price_time, price_rank
         return None, None, None
 
-    async def rt_subscribe(self, callback: Callable[..., Any]) -> None:
+    async def rt_subscribe(self, callback: Callable[..., Any]) -> None:  # noqa: PLR0915
         """Connect to Tibber and subscribe to Tibber real time subscription.
 
         :param callback: The function to call when data is received.
@@ -436,11 +436,15 @@ 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")
+                client = self._tibber_control.realtime.sub_manager
+                if hasattr(client, "subscribe"):
+                    subscribe_method: Any = client.subscribe
+                elif hasattr(client, "session") and hasattr(client.session, "subscribe"):
+                    subscribe_method = client.session.subscribe  # type: ignore[assignment]
+                else:
+                    _LOGGER.error("Client does not support subscribe method")
                     return
-                async for _data in session.subscribe(
+                async for _data in subscribe_method(  # type: ignore[attr-defined]
                     gql(LIVE_SUBSCRIBE % self.home_id),
                 ):
                     data = {"data": _data}

tibber/realtime.py

@@ -54,12 +54,7 @@ async def disconnect(self) -> None:
             home.rt_unsubscribe()
         if self.sub_manager is None:
             return
-        try:
-            if not hasattr(self.sub_manager, "session"):
-                return
-            await self.sub_manager.close_async()
-        finally:
-            self.sub_manager = None
+        await self._close_sub_manager()
 
     async def connect(self) -> None:
         """Start subscription manager."""
@@ -136,11 +131,7 @@ async def _watchdog(self) -> None:
                 self.sub_manager.transport.reconnect_at,
             )
 
-            try:
-                if hasattr(self.sub_manager, "session"):
-                    await self.sub_manager.close_async()
-            except Exception:
-                _LOGGER.exception("Error in watchdog close")
+            await self._close_sub_manager()
 
             if not self._watchdog_running:
                 _LOGGER.debug("Watchdog: Stopping")
@@ -185,11 +176,15 @@ def add_home(self, home: TibberHome) -> bool:
     @property
     def subscription_running(self) -> bool:
         """Is real time subscription running."""
-        return (
-            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")
+        if self.sub_manager is None:
+            return False
+        if not isinstance(self.sub_manager.transport, TibberWebsocketsTransport):
+            return False
+        if not self.sub_manager.transport.running:
+            return False
+        # Check if client supports subscriptions (directly on client or via its session attribute)
+        return hasattr(self.sub_manager, "subscribe") or (
+            hasattr(self.sub_manager, "session") and hasattr(self.sub_manager.session, "subscribe")
         )
 
     @property
@@ -210,3 +205,18 @@ def sub_endpoint(self, sub_endpoint: str) -> None:
                     ssl=self._ssl_context,
                 ),
             )
+
+    async def _close_sub_manager(self) -> None:
+        """Close the subscription manager."""
+        try:
+            if self.sub_manager is None:
+                return
+            if hasattr(self.sub_manager, "close_async"):
+                await self.sub_manager.close_async()
+            elif hasattr(self.sub_manager, "close"):
+                await self.sub_manager.close()
+        except Exception:  # noqa: BLE001
+            # Catch all other exceptions as the gql client may raise various exceptions
+            _LOGGER.debug("Error closing sub_manager", exc_info=True)
+        finally:
+            self.sub_manager = None