lghorizon 0.7.3__tar.gz → 0.7.3b1__tar.gz

{lghorizon-0.7.3 → lghorizon-0.7.3b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lghorizon
-Version: 0.7.3
+Version: 0.7.3b1
 Summary: Python client for Liberty Global Horizon settop boxes
 Home-page: https://github.com/sholofly/LGHorizon-python
 Author: Rudolf Offereins

{lghorizon-0.7.3 → lghorizon-0.7.3b1}/lghorizon/__init__.py

@@ -9,11 +9,7 @@ from .models import (
     LGHorizonRecordingEpisode,
     LGHorizonCustomer,
 )
-from .exceptions import (
-    LGHorizonApiUnauthorizedError,
-    LGHorizonApiConnectionError,
-    LGHorizonApiLockedError,
-)
+from .exceptions import LGHorizonApiUnauthorizedError, LGHorizonApiConnectionError
 from .const import (
     ONLINE_RUNNING,
     ONLINE_STANDBY,

lghorizon-0.7.3b1/lghorizon/exceptions.py

@@ -0,0 +1,11 @@
+"""Exceptions for the LGHorizon API."""
+
+class LGHorizonApiError(Exception):
+    """Generic GeocachingApi exception."""
+
+class LGHorizonApiConnectionError(LGHorizonApiError):
+    """Generic GeocachingApi exception."""
+
+class LGHorizonApiUnauthorizedError(Exception):
+    """Generic GeocachingApi exception."""
+        

{lghorizon-0.7.3 → lghorizon-0.7.3b1}/lghorizon/lghorizon_api.py

@@ -3,11 +3,7 @@
 import logging
 import json
 import sys, traceback
-from .exceptions import (
-    LGHorizonApiUnauthorizedError,
-    LGHorizonApiConnectionError,
-    LGHorizonApiLockedError,
-)
+from .exceptions import LGHorizonApiUnauthorizedError, LGHorizonApiConnectionError
 import backoff
 from requests import Session, exceptions as request_exceptions
 from paho.mqtt.client import WebsocketConnectionError
@@ -86,6 +82,9 @@ class LGHorizonApi:
         self._identifier = identifier
         self._profile_id = profile_id
 
+    @backoff.on_exception(
+        backoff.expo, LGHorizonApiConnectionError, max_tries=3, logger=_logger
+    )
     def _authorize(self) -> None:
         ctry_code = self._country_code[0:2]
         if ctry_code == "be":
@@ -112,8 +111,6 @@ class LGHorizonApi:
             error = error_json["error"]
             if error and error["statusCode"] == 97401:
                 raise LGHorizonApiUnauthorizedError("Invalid credentials")
-            elif error and error["statusCode"] == 97117:
-                raise LGHorizonApiLockedError("Account locked")
             elif error:
                 raise LGHorizonApiConnectionError(error["message"])
             else:
@@ -239,14 +236,7 @@ class LGHorizonApi:
         _logger.debug(f"MQTT token: {self._auth.mqttToken}")
 
     @backoff.on_exception(
-        backoff.expo,
-        BaseException,
-        jitter=None,
-        max_tries=3,
-        logger=_logger,
-        giveup=lambda e: isinstance(
-            e, (LGHorizonApiLockedError, LGHorizonApiUnauthorizedError)
-        ),
+        backoff.expo, BaseException, jitter=None, max_time=600, logger=_logger
     )
     def connect(self) -> None:
         self._config = self._get_config(self._country_code)
@@ -266,7 +256,7 @@ class LGHorizonApi:
     def disconnect(self):
         """Disconnect."""
         _logger.debug("Disconnect from API")
-        if not self._mqttClient or not self._mqttClient.is_connected:
+        if not self._mqttClient.is_connected:
             return
         self._mqttClient.disconnect()
 
@@ -277,14 +267,7 @@ class LGHorizonApi:
             box.register_mqtt()
 
     def _on_mqtt_message(self, message: str, topic: str) -> None:
-        if "action" in message and message["action"] == "OPS.getProfilesUpdate":
-            self._update_customer()
-            self._channels.clear()
-            self._get_channels()
-            box: LGHorizonBox
-            for box in self.settop_boxes.values():
-                box.update_channels(self._channels)
-        elif "source" in message:
+        if "source" in message:
             deviceId = message["source"]
             if not isinstance(deviceId, str):
                 _logger.debug("ignoring message - not a string")
@@ -296,7 +279,6 @@ class LGHorizonApi:
                     self.settop_boxes[deviceId].update_state(message)
                 if "status" in message:
                     self._handle_box_update(deviceId, message)
-
             except Exception:
                 _logger.exception("Could not handle status message")
                 _logger.warning(f"Full message: {str(message)}")
@@ -396,9 +378,14 @@ class LGHorizonApi:
         return json_response
 
     def _register_customer_and_boxes(self):
-        self._update_customer()
+        _logger.info("Get personalisation info...")
+        personalisation_result = self._do_api_call(
+            f"{self._config['personalizationService']['URL']}/v1/customer/{self._auth.householdId}?with=profiles%2Cdevices"
+        )
+        _logger.debug("Personalisation result: %s ", personalisation_result)
+        self.customer = LGHorizonCustomer(personalisation_result)
         self._get_channels()
-        if len(self.customer.settop_boxes) == 0:
+        if "assignedDevices" not in personalisation_result:
             _logger.warning("No boxes found.")
             return
         _logger.info("Registering boxes")
@@ -419,14 +406,6 @@ class LGHorizonApi:
             self.settop_boxes[box.deviceId] = box
             _logger.info("Box %s registered...", box.deviceId)
 
-    def _update_customer(self):
-        _logger.info("Get customer data")
-        personalisation_result = self._do_api_call(
-            f"{self._config['personalizationService']['URL']}/v1/customer/{self._auth.householdId}?with=profiles%2Cdevices"
-        )
-        _logger.debug("Personalisation result: %s ", personalisation_result)
-        self.customer = LGHorizonCustomer(personalisation_result)
-
     def _get_channels(self):
         self._update_entitlements()
         _logger.info("Retrieving channels...")

{lghorizon-0.7.3 → lghorizon-0.7.3b1}/lghorizon/models.py

@@ -438,9 +438,6 @@ class LGHorizonBox:
             self.manufacturer = platform_type["manufacturer"]
             self.model = platform_type["model"]
 
-    def update_channels(self, channels: Dict[str, LGHorizonChannel]):
-        self._channels = channels
-
     def register_mqtt(self) -> None:
         if not self._mqtt_client.is_connected:
             raise Exception("MQTT client not connected.")

{lghorizon-0.7.3 → lghorizon-0.7.3b1}/lghorizon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lghorizon
-Version: 0.7.3
+Version: 0.7.3b1
 Summary: Python client for Liberty Global Horizon settop boxes
 Home-page: https://github.com/sholofly/LGHorizon-python
 Author: Rudolf Offereins

lghorizon-0.7.3/lghorizon/exceptions.py

@@ -1,17 +0,0 @@
-"""Exceptions for the LGHorizon API."""
-
-
-class LGHorizonApiError(Exception):
-    """Generic LGHorizon exception."""
-
-
-class LGHorizonApiConnectionError(LGHorizonApiError):
-    """Generic LGHorizon exception."""
-
-
-class LGHorizonApiUnauthorizedError(Exception):
-    """Generic LGHorizon exception."""
-
-
-class LGHorizonApiLockedError(LGHorizonApiUnauthorizedError):
-    """Generic LGHorizon exception."""