removed default header from constructor

Author: eavanvalkenburg

src/brunt/client.py

@@ -4,7 +4,7 @@
 import logging
 from datetime import datetime
 from types import TracebackType
-from typing import Any, List, Optional, Type, Union
+from typing import Any, Type
 
 from aiohttp.client import ClientSession
 from requests import Session
@@ -32,7 +32,7 @@ def __init__(self, username: str = None, password: str = None):
         """
         self._user: str | None = username
         self._pass: str | None = password
-        self._things: List[Thing] | None = None
+        self._things: list[Thing] | None = None
         self._last_login: datetime | None = None
         self._last_requested_position: dict[str, int] | None = None
 
@@ -140,9 +140,9 @@ def __enter__(self) -> BruntClient:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: Type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         """Exit the context manager."""
         self.close()
@@ -163,7 +163,7 @@ def login(self, username: str = None, password: str = None) -> bool:
         self._last_login = datetime.utcnow()
         return True
 
-    def get_things(self, force: bool = False) -> List[Thing]:
+    def get_things(self, force: bool = False) -> list[Thing]:
         """Get all the things.
 
         Check if there are things in memory. otherwise first do the getThings call
@@ -175,7 +175,7 @@ def get_things(self, force: bool = False) -> List[Thing]:
             return self._get_things()
         return self._things
 
-    def _get_things(self) -> List[Thing]:
+    def _get_things(self) -> list[Thing]:
         """Get the things registered in your account.
 
         :return: dict with things registered in the logged in account
@@ -211,7 +211,7 @@ def get_state(self, thing: str = None, thing_uri: str = None) -> Thing:
 
     def change_key(
         self, key: str, value: Any, thing: str = None, thing_uri: str = None
-    ) -> Union[dict, list]:
+    ) -> dict | list:
         """Change a variable of the thing.  Mostly included for future additions.
 
         :param key: The value you want to change
@@ -238,7 +238,7 @@ def change_key(
 
     def change_request_position(
         self, request_position: int, thing: str = None, thing_uri: str = None
-    ) -> Union[dict, list]:
+    ) -> dict | list:
         """Change the position of the thing.
 
         :param request_position: The new position for the slide (0-100)
@@ -288,9 +288,9 @@ async def __aenter__(self) -> BruntClientAsync:
 
     async def __aexit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: Type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         """Exit the context manager."""
         await self.async_close()
@@ -313,7 +313,7 @@ async def async_login(self, username: str = None, password: str = None) -> bool:
         self._last_login = datetime.utcnow()
         return True
 
-    async def async_get_things(self, force: bool = False) -> List[Thing]:
+    async def async_get_things(self, force: bool = False) -> list[Thing]:
         """Get the things registered in your account.
 
         :param force: force a refresh from the server, otherwise get from variable.
@@ -323,7 +323,7 @@ async def async_get_things(self, force: bool = False) -> List[Thing]:
             return await self._async_get_things()
         return self._things
 
-    async def _async_get_things(self) -> List[Thing]:
+    async def _async_get_things(self) -> list[Thing]:
         """Get the things.
 
         Check if there are things in memory, otherwise first do the getThings call and
@@ -359,7 +359,7 @@ async def async_get_state(self, thing: str = None, thing_uri: str = None) -> Thi
 
     async def async_change_key(
         self, key: str, value: Any, thing: str = None, thing_uri: str = None
-    ) -> Union[dict, list]:
+    ) -> dict | list:
         """Change a variable of the thing.  Mostly included for future additions.
 
         :param key: The value you want to change
@@ -386,7 +386,7 @@ async def async_change_key(
 
     async def async_change_request_position(
         self, request_position: int, thing: str = None, thing_uri: str = None
-    ) -> Union[dict, list]:
+    ) -> dict | list:
         """Change the position of the thing.
 
         :param request_position: The new position for the slide (0-100)

src/brunt/const.py

@@ -1,6 +1,8 @@
+"""Constants for Brunt."""
+
 MAIN_HOST = "https://sky.brunt.co"
 MAIN_THINGS_PATH = {"path": "/thing", "host": MAIN_HOST}
 THINGS_HOST = "https://thing.brunt.co:8080"
 REQUEST_POSITION_KEY = "requestPosition"
 DT_FORMAT_STRING = r"%a, %d-%b-%Y %H:%M:%S %Z"
-COOKIE_DOMAIN = "brunt.co"
+COOKIE_DOMAIN = "brunt.co"

src/brunt/http.py

@@ -1,30 +1,28 @@
 """Main code for brunt http."""
+from __future__ import annotations
+
 import json
 import logging
 from abc import abstractmethod, abstractproperty
 from datetime import datetime
-from typing import Union
+from typing import Final
 
 import requests
 from aiohttp import ClientSession
-from multidict import CIMultiDict
-from requests.utils import CaseInsensitiveDict
 
 from .const import COOKIE_DOMAIN, DT_FORMAT_STRING
 from .utils import RequestTypes
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_HEADER = CaseInsensitiveDict(
-    {
-        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-        "Origin": "https://sky.brunt.co",
-        "Accept-Language": "en-gb",
-        "Accept": "application/vnd.brunt.v1+json",
-        "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) \
+DEFAULT_HEADER: Final = {
+    "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+    "Origin": "https://sky.brunt.co",
+    "Accept-Language": "en-gb",
+    "Accept": "application/vnd.brunt.v1+json",
+    "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) \
 AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E216",
-    }
-)
+}
 
 
 class BaseBruntHTTP:
@@ -34,21 +32,21 @@ class BaseBruntHTTP:
     def _prepare_request(data: dict) -> dict:
         """Prepare the payload and add the length to the header, payload might be empty."""
         payload = ""
-        headers = {}
+        headers = DEFAULT_HEADER.copy()
         if "data" in data:
             payload = json.dumps(data["data"])
             headers = {"Content-Length": str(len(payload))}
 
         return {"url": data["host"] + data["path"], "data": payload, "headers": headers}
 
     @abstractmethod
-    def request(self, data: dict, request_type: RequestTypes) -> Union[dict, list]:
+    def request(self, data: dict, request_type: RequestTypes) -> dict | list:
         """Return the request response - abstract."""
 
     @abstractmethod
     async def async_request(
         self, data: dict, request_type: RequestTypes
-    ) -> Union[dict, list]:
+    ) -> dict | list:
         """Return the request response - abstract."""
 
     @abstractproperty
@@ -62,7 +60,6 @@ class BruntHttp(BaseBruntHTTP):
     def __init__(self, session: requests.Session = None):
         """Initialize the BruntHTTP object."""
         self.session = session if session else requests.Session()
-        self.session.headers = DEFAULT_HEADER
 
     @property
     def is_logged_in(self) -> bool:
@@ -81,11 +78,11 @@ def is_logged_in(self) -> bool:
 
     async def async_request(
         self, data: dict, request_type: RequestTypes
-    ) -> Union[dict, list]:
+    ) -> dict | list:
         """Raise error for using this call with sync."""
         raise NotImplementedError("You are using the sync version, please use request.")
 
-    def request(self, data: dict, request_type: RequestTypes) -> Union[dict, list]:
+    def request(self, data: dict, request_type: RequestTypes) -> dict | list:
         """Request the data.
 
         :param session: session object from the Requests package
@@ -96,7 +93,8 @@ def request(self, data: dict, request_type: RequestTypes) -> Union[dict, list]:
         :raises: raises errors from Requests through the raise_for_status function
         """
         resp = self.session.request(
-            request_type.value, **BaseBruntHTTP._prepare_request(data)
+            request_type.value,
+            **BaseBruntHTTP._prepare_request(data),
         )
         # raise an error if it occured in the Request.
         resp.raise_for_status()
@@ -112,7 +110,6 @@ class BruntHttpAsync(BaseBruntHTTP):
     def __init__(self, session: ClientSession = None):
         """Initialize the BruntHTTP object."""
         self.session = session if session else ClientSession()
-        self.session._default_headers = CIMultiDict(DEFAULT_HEADER)
 
     @property
     def is_logged_in(self) -> bool:
@@ -128,15 +125,15 @@ def is_logged_in(self) -> bool:
                     )
         return False
 
-    def request(self, data: dict, request_type: RequestTypes) -> Union[dict, list]:
+    def request(self, data: dict, request_type: RequestTypes) -> dict | list:
         """Raise error for using this call with async."""
         raise NotImplementedError(
             "You are using the Async version, please use async_request."
         )
 
     async def async_request(
         self, data: dict, request_type: RequestTypes
-    ) -> Union[dict, list]:
+    ) -> dict | list:
         """Request the data.
 
         :param session: session object from the Requests package
@@ -149,7 +146,7 @@ async def async_request(
         async with self.session.request(
             request_type.value,
             **BaseBruntHTTP._prepare_request(data),
-            raise_for_status=True
+            raise_for_status=True,
         ) as resp:
             try:
                 return await resp.json(content_type=None)

src/brunt/thing.py

@@ -6,9 +6,6 @@
 from datetime import datetime
 from typing import Any
 
-# state: {'TIMESTAMP': '1619179952875', 'NAME': 'Blind', 'SERIAL': '00140d6f1950f166', 'MODEL': 'BEAKR1601', 'requestPosition': '100', 'currentPosition': '100', 'moveState': '0', 'setLoad': '2418', 'currentLoad': '5', 'FW_VERSION': '1.361', 'overStatus': '0', 'Duration': '1000', 'ICON': 'b-icon-curtain_01', 'delay': 3810}
-# things: [{'TIMESTAMP': '1619179952875', 'NAME': 'Blind', 'SERIAL': '00140d6f1950f166', 'MODEL': 'BEAKR1601', 'requestPosition': '100', 'currentPosition': '100', 'moveState': '0', 'setLoad': '2418', 'currentLoad': '5', 'FW_VERSION': '1.361', 'overStatus': '0', 'Duration': '1000', 'ICON': 'b-icon-curtain_01', 'thingUri': '/hub/00140d6f1950f166', 'PERMISSION_TYPE': '"ownership"', 'delay': 2594}]
-
 _LOGGER = logging.getLogger(__name__)
 
 MAPPING = {