Fix some typing issues

Author: GrandMoff100

homeassistant_api/baseclient.py

@@ -62,9 +62,6 @@ def prepare_headers(
         """Prepares and verifies dictionary headers."""
         if headers is None:
             return dict(self._headers)
-        if not isinstance(headers, dict):
-            msg = f"headers must be dict or dict subclass, not type {type(headers)!r}"
-            raise TypeError(msg)
         return {**self._headers, **headers}
 
     @staticmethod

homeassistant_api/client.py

@@ -47,7 +47,7 @@ class Client(BaseClient):
     :param global_request_kwargs: Kwargs to pass to :func:`requests.request`. Optional.
     """  # pylint: disable=line-too-long
 
-    _session: Session | None
+    _session: Session
 
     def __init__(
         self,

homeassistant_api/models/domains.py

@@ -51,7 +51,7 @@ def _build_from_json(cls, json: dict[str, Any], **model_kwargs: Any) -> Self:
             msg = "Missing services or domain attribute in json argument."
             raise ValueError(msg)
         domain = cls(domain_id=cast("str", json.get("domain")), **model_kwargs)
-        services = cast("dict[str, dict[str, Any]]", json.get("services"))
+        services = json.get("services")
         if not isinstance(services, dict):
             msg = f"Expected dict for services, got {type(services)}"
             raise TypeError(msg)

homeassistant_api/processing.py

@@ -58,9 +58,18 @@ def _check_status(info: ResponseInfo, content: str) -> None:
 
 def _extract_info(response: ResponseType) -> ResponseInfo:
     """Extract status code, URL, and method from a response."""
+    if response.status_code is None:
+        msg = "Response is missing status code."
+        raise ValueError(msg)
+    if response.request is None:
+        msg = "Response is missing request information."
+        raise ValueError(msg)
+    if response.url is None:
+        msg = "Response is missing URL information."
+        raise ValueError(msg)
     return ResponseInfo(
         status_code=response.status_code,
-        url=str(response.url),
+        url=response.url,
         method=response.request.method,
     )
 
@@ -70,7 +79,7 @@ def _check_sync_status(response: ResponseType) -> None:
     info = _extract_info(response)
     if info.status_code in (HTTPStatus.OK, HTTPStatus.CREATED):
         return
-    _check_status(info, content=response.text)
+    _check_status(info, content=_parse_text(response))
 
 
 # --- Individual parse functions ---
@@ -87,6 +96,9 @@ def _parse_json(response: ResponseType) -> Any:
 
 def _parse_text(response: ResponseType) -> str:
     """Return the plaintext content of a sync response."""
+    if response.text is None:
+        msg = "Response is missing text content."
+        raise MalformedDataError(msg)
     return response.text
 
 
@@ -104,9 +116,12 @@ def _parse_text(response: ResponseType) -> str:
 
 def _parse_content(response: ResponseType) -> Any:
     """Look up and call the appropriate parser by content-type."""
-    mimetype = response.headers.get("content-type", "text/plain").split(";")[0]
-    parser = _PARSERS.get(mimetype)
-    if parser is None:
+    content_type = response.headers.get("content-type", "text/plain")
+    if isinstance(content_type, bytes):
+        content_type = content_type.decode("utf-8")
+    mimetype = str(content_type).split(";")[0].strip().lower()
+
+    if (parser := _PARSERS.get(mimetype)) is None:
         msg = f"No response processor found for mimetype {mimetype!r}."
         raise ProcessorNotFoundError(msg)
     return parser(response)

tests/test_errors.py

@@ -7,8 +7,6 @@
 
 import niquests
 import pytest
-from multidict import CIMultiDict
-from multidict import CIMultiDictProxy
 
 from homeassistant_api import AsyncClient
 from homeassistant_api import AsyncWebsocketClient
@@ -165,7 +163,7 @@ def make_response(
         text=content,
         url="http://localhost/api/test",
         request=unittest.mock.Mock(method="GET"),
-        headers=CIMultiDictProxy(CIMultiDict(headers)),
+        headers=headers,
         json=unittest.mock.Mock(
             side_effect=json.JSONDecodeError("This is a fake message", "", 1),
         ),
@@ -184,7 +182,7 @@ def make_async_response(
         text=content,
         url="http://localhost/api/test",
         request=unittest.mock.Mock(method="GET"),
-        headers=CIMultiDictProxy(CIMultiDict(headers)),
+        headers=headers,
         json=unittest.mock.Mock(
             side_effect=json.JSONDecodeError("This is a fake message", "", 1),
         ),