Add parent device to new devicelist

Author: Khole Jones

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v3.20.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 25.9.0
     hooks:
       - id: black
         args:
           - --safe
           - --quiet
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         args:
@@ -21,36 +21,36 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json]
   - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+    rev: 7.3.0
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-docstrings==1.5.0
           - pydocstyle==5.1.1
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.4
+    rev: 1.8.6
     hooks:
       - id: bandit
         args:
           - --quiet
           - --format=custom
           - --configfile=tests/bandit.yaml
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 6.0.1
     hooks:
       - id: isort
         args: ["--profile", "black"]
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.26.3
+    rev: v1.37.1
     hooks:
       - id: yamllint
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         stages: [manual]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v6.0.0
     hooks:
       - id: check-executables-have-shebangs
         stages: [manual]
@@ -59,13 +59,10 @@ repos:
       - id: no-commit-to-branch
         args:
           - --branch=master
-  - repo: local
+  - repo: https://github.com/pycqa/pylint
+    rev: v3.3.1
     hooks:
       - id: pylint
-        name: pylint
-        entry: pylint
-        language: system
-        types: [python]
         args:
           [
             "-rn",  # Only display messages

setup.py

@@ -9,23 +9,22 @@
 
 def requirements_from_file(filename="requirements_all.txt"):
     """Get requirements from file."""
-    with open(os.path.join(os.path.dirname(__file__), filename)) as r:
+    with open(os.path.join(os.path.dirname(__file__), filename), encoding="utf-8") as r:
         reqs = r.read().strip().split("\n")
     # Return non empty lines and non comments
     return [r for r in reqs if re.match(r"^\w+", r)]
 
 
 setup(
-    version="1.0.1",
+    version="1.0.4",
     package_data={"data": ["*.json"]},
     include_package_data=True,
     cmdclass={
         "build_py": unasync.cmdclass_build_py(
             rules=[
                 unasync.Rule(
                     "/src/apyhiveapi/",
-                    "
-                    /pyhiveapi/",
+                    "/pyhiveapi/",
                     additional_replacements={
                         "apyhiveapi": "pyhiveapi",
                         "asyncio": "threading",

src/apyhiveapi/api/hive_auth_async.py

@@ -17,6 +17,7 @@
 
 from ..helper.hive_exceptions import (
     HiveApiError,
+    HiveFailedToRefreshTokens,
     HiveInvalid2FACode,
     HiveInvalidDeviceAuthentication,
     HiveInvalidPassword,
@@ -560,6 +561,12 @@ async def refresh_token(self, token):
                 "NotAuthorizedException",
                 "CodeMismatchException",
             ):
+                error_message = err.response.get("Error", {}).get("Message", "")
+                if any(
+                    msg in error_message
+                    for msg in ["Refresh Token has expired", "Invalid Refresh Token"]
+                ):
+                    raise HiveFailedToRefreshTokens from err
                 raise HiveInvalid2FACode from err
         except botocore.exceptions.EndpointConnectionError as err:
             if err.__class__.__name__ == "EndpointConnectionError":

src/apyhiveapi/session.py

@@ -2,23 +2,15 @@
 
 import asyncio
 import copy
-from datetime import datetime, timedelta
 import json
 import operator
 import os
 import time
+from datetime import datetime, timedelta
 from typing import Optional
 
 from aiohttp.web import HTTPException
 
-
-if __name__ == "pyhiveapi":
-    from .api.hive_api import HiveApi as API
-    from .api.hive_auth import HiveAuth as Auth
-else:
-    from .api.hive_async_api import HiveApiAsync as API
-    from .api.hive_auth_async import HiveAuthAsync as Auth
-
 from .device_attributes import HiveAttributes
 from .helper.const import ACTIONS, DEVICES, HIVE_TYPES, PRODUCTS
 from .helper.hive_exceptions import (
@@ -36,6 +28,13 @@
 from .helper.logger import Logger
 from .helper.map import Map
 
+if __name__ == "pyhiveapi":
+    from .api.hive_api import HiveApi as API
+    from .api.hive_auth import HiveAuth as Auth
+else:
+    from .api.hive_async_api import HiveApiAsync as API
+    from .api.hive_auth_async import HiveAuthAsync as Auth
+
 
 class HiveSession:
     """Hive Session Code.
@@ -160,12 +159,18 @@ def add_list(self, entity_type: str, data: dict, **kwargs: dict):
             if kwargs.get("ha_name", "FALSE")[0] == " ":
                 kwargs["ha_name"] = device_name + kwargs["ha_name"]
             else:
-                formatted_data["ha_name"] = device_name
+                formatted_data["haName"] = device_name
+
             formatted_data.update(kwargs)
-            self.device_list[entity_type].append(formatted_data)
+
+            if data.get("type", "") == "hub":
+                self.device_list["parent"].append(formatted_data)
+            else:
+                self.device_list[entity_type].append(formatted_data)
+
             return formatted_data
         except KeyError as error:
-            self.logger.error(error)
+            self.log.error(error)
             return None
 
     async def update_interval(self, new_interval: timedelta):
@@ -488,7 +493,7 @@ async def start_session(self, config: dict = None):
             config (dict, optional): Configuration for Home Assistant to use. Defaults to {}.
 
         Raises:
-            HiveUnknownConfiguration: Unknown configuration identifed.
+            HiveUnknownConfiguration: Unknown configuration identified.
             HiveReauthRequired: Tokens have expired and reauthentication is required.
 
         Returns:
@@ -527,6 +532,7 @@ async def create_devices(self):
         Returns:
             list: List of devices
         """
+        self.device_list["parent"] = []
         self.device_list["alarm_control_panel"] = []
         self.device_list["binary_sensor"] = []
         self.device_list["camera"] = []
@@ -553,8 +559,7 @@ async def create_devices(self):
                 try:
                     eval("self." + code)
                 except (NameError, AttributeError, KeyError) as e:
-                    self.logger.warning(f"Device {product_name} cannot be setup - {e}")
-                    pass
+                    self.log.warning(f"Device {product_name} cannot be setup - {e}")
 
             if self.data.products[a_product]["type"] in hive_type:
                 self.config.mode.append(p["id"])