Fix type aliasing

Author: GrandMoff100

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
         additional_dependencies:
           - types-requests
           - types-simplejson
-    rev: "v0.931"
+    rev: "v1.17.1"
   - repo: https://github.com/pre-commit/pre-commit-hooks
     hooks:
       - id: trailing-whitespace

docs/conf.py

@@ -27,7 +27,9 @@
 # The full version, including alpha/beta/rc tags
 with open("../pyproject.toml") as f:
     pyproject = f.read()
-    release = version = re.search('version = "(.+?)"', pyproject).group(1)
+    search_result = re.search('version = "(.+?)"', pyproject)
+    assert search_result is not None
+    release = version = search_result.group(1)
 
 # -- General configuration ---------------------------------------------------
 

homeassistant_api/models/base.py

@@ -6,6 +6,11 @@
 from pydantic import BaseModel as PydanticBaseModel
 from pydantic import ConfigDict, PlainSerializer
 
+__all__ = (
+    "BaseModel",
+    "DatetimeIsoField",
+)
+
 DatetimeIsoField = Annotated[
     datetime,
     PlainSerializer(lambda x: x.isoformat(), return_type=str, when_used="json"),

homeassistant_api/models/states.py

@@ -9,6 +9,11 @@
 
 from homeassistant_api.models.base import BaseModel, DatetimeIsoField
 
+__all__ = (
+    "Context",
+    "State",
+)
+
 
 class Context(BaseModel):
     """Model for entity state contexts."""

homeassistant_api/models/websocket.py

@@ -4,8 +4,8 @@
 
 from homeassistant_api.utils import JSONType
 
-from .base import BaseModel
-from .states import Context, DatetimeIsoField
+from .base import BaseModel, DatetimeIsoField
+from .states import Context
 
 __all__ = (
     "AuthRequired",

homeassistant_api/processing.py

@@ -61,7 +61,7 @@ def process_content(self, *, async_: bool = False) -> Any:
         calls the processor with the response.
         """
 
-        mimetype_header = self._response.headers.get(  # type: ignore [arg-type]
+        mimetype_header = self._response.headers.get(
             "content-type",
             "text/plain",
         )

homeassistant_api/rawclient.py

@@ -73,7 +73,7 @@ def __init__(
         if cache_session is False:
             self.cache_session = requests.Session()
         elif cache_session is None:
-            self.cache_session = requests_cache.CachedSession(  # type: ignore[attr-defined]
+            self.cache_session = requests_cache.CachedSession(
                 cache_name="default_cache",
                 backend="memory",
                 expire_after=300,

homeassistant_api/rawwebsocket.py

@@ -84,7 +84,7 @@ def _recv(self) -> dict[str, JSONType]:
             raise ReceivingError("Connection is not open!")
         _bytes = self._conn.recv()
         logger.debug("Received message: %s", _bytes)
-        return json.loads(_bytes)
+        return cast(dict[str, JSONType], json.loads(_bytes))
 
     def send(self, type: str, include_id: bool = True, **data: Any) -> int:
         """
@@ -95,7 +95,7 @@ def send(self, type: str, include_id: bool = True, **data: Any) -> int:
         if include_id:  # auth messages don't have an id
             data["id"] = self._request_id()
         data["type"] = type
-
+        assert isinstance(data["id"], int)
         self._send(data)
 
         if "id" in data:

homeassistant_api/utils.py

@@ -1,7 +1,7 @@
 import re
-from typing import Optional
+from typing import Optional, TypeAlias, Union
 
-JSONType = int | float | str | bool | list["JSONType"] | dict[str, "JSONType"]
+JSONType: TypeAlias = Union[int, float, str, bool, list["JSONType"], dict[str, "JSONType"]]
 
 
 def format_entity_id(entity_id: str) -> str: