Silly type hinting

Author: GrandMoff100

homeassistant_api/errors.py

@@ -10,17 +10,29 @@ class HomeassistantAPIError(Exception):
 class RequestError(HomeassistantAPIError):
     """Error raised when an issue occurs when requesting to Homeassistant."""
 
-    def __init__(self, data: str, /, url: str) -> None:
-        if data is None:
+    def __init__(
+        self, data: Optional[str], /, url: str, message: Optional[str] = None
+    ) -> None:
+        if message is not None:
+            super().__init__(
+                message
+                + f" {url!r}"
+                + (f" with data: {data!r}" if data is not None else "")
+            )
+        elif data is None:
             super().__init__(f"An error occurred while making the request to {url!r}")
         else:
             super().__init__(
                 f"An error occurred while making the request to {url!r} with data: {data!r}"
             )
 
+
 class RequestTimeoutError(RequestError):
     """Error raised when a request times out."""
 
+    def __init__(self, message: str, url: str) -> None:
+        super().__init__(None, url, message)
+
 
 class ResponseError(HomeassistantAPIError):
     """Error raised when an issue occurs in a response from Homeassistant."""

homeassistant_api/rawasyncclient.py

@@ -112,7 +112,8 @@ async def async_request(
             )
         except asyncio.exceptions.TimeoutError as err:
             raise RequestTimeoutError(
-                f'Home Assistant did not respond in time (timeout: {kwargs.get("timeout", 300)} sec)'
+                f'Home Assistant did not respond in time (timeout: {kwargs.get("timeout", 300)} sec)',
+                self.endpoint(path) + f"?{params}" * bool(params),
             ) from err
 
     @staticmethod
@@ -145,7 +146,9 @@ async def async_get_logbook_entries(
         :code:`GET /api/logbook/<timestamp>`
         """
         params, url = self.prepare_get_logbook_entry_params(*args, **kwargs)
-        data = await self.async_request(url, params=params)
+        data = await self.async_request(
+            url, params=self.construct_params(cast(Dict[str, Optional[str]], params))
+        )
         for entry in data:
             yield LogbookEntry.model_validate(entry)
 

homeassistant_api/rawbaseclient.py

@@ -70,7 +70,9 @@ def construct_params(params: Dict[str, Optional[str]]) -> str:
         For keys with corresponding non-None values, the query string will be key-value pairs (i.e. :code:`?key1=value1&key2=value2`).
         To have an empty value use an empty string :code:`""` (i.e. :code:`?key1=&key2=value2`).
         """
-        return "&".join([k if v is None else f"{k}={quote_plus(v)}" for k, v in params.items()])
+        return "&".join(
+            [k if v is None else f"{k}={quote_plus(v)}" for k, v in params.items()]
+        )
 
     @staticmethod
     def prepare_get_entity_histories_params(

homeassistant_api/rawclient.py

@@ -107,7 +107,8 @@ def request(
                 )
         except requests.exceptions.Timeout as err:
             raise RequestTimeoutError(
-                f'Home Assistant did not respond in time (timeout: {kwargs.get("timeout", 300)} sec)'
+                f'Home Assistant did not respond in time (timeout: {kwargs.get("timeout", 300)} sec)',
+                url=self.endpoint(path) + f"?{params}" * bool(params),
             ) from err
         return self.response_logic(response=resp, decode_bytes=decode_bytes)
 
@@ -141,7 +142,9 @@ def get_logbook_entries(
         :code:`GET /api/logbook/<timestamp>`
         """
         params, url = self.prepare_get_logbook_entry_params(*args, **kwargs)
-        data = self.request(url, params=params)
+        data = self.request(
+            url, params=self.construct_params(cast(Dict[str, Optional[str]], params))
+        )
         for entry in data:
             yield LogbookEntry.model_validate(entry)