minor tweaks, rename to HotWater

zxdavb · Dec 30, 2024 · 82e7e41 · 82e7e41
1 parent 0328327
commit 82e7e41
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 13 deletions.
diff --git a/src/evohomeasync/__init__.py b/src/evohomeasync/__init__.py
@@ -12,7 +12,8 @@
 import aiohttp
 
 from .auth import AbstractSessionManager
-from .exceptions import (  # noqa: F401
+from .entities import ControlSystem, Gateway, HotWater, Location, Zone
+from .exceptions import (
     ApiRateLimitExceededError,
     ApiRequestFailedError,
     AuthenticationFailedError,
@@ -114,3 +115,30 @@ def __init__(
             session_id=session_id,
         )
         super().__init__(self._session_manager, debug=debug)
+
+
+__all__ = [  # noqa: RUF022
+    "EvohomeClient",
+    "AbstractSessionManager",
+    #
+    "Location",
+    "Gateway",
+    "ControlSystem",
+    "Zone",
+    "HotWater",
+    #
+    "ApiRateLimitExceededError",
+    "ApiRequestFailedError",
+    "AuthenticationFailedError",
+    "BadApiRequestError",
+    "BadApiResponseError",
+    "BadApiSchemaError",
+    "BadScheduleUploadedError",
+    "ConfigError",
+    "EvohomeError",
+    "InvalidConfigError",
+    "InvalidScheduleError",
+    "InvalidStatusError",
+    "NoSingleTcsError",
+    "StatusError",
+]
diff --git a/src/evohomeasync/entities.py b/src/evohomeasync/entities.py
@@ -107,7 +107,7 @@ def _update_status(self, status: EvoDevInfoDictT | EvoGwyInfoDictT) -> None:
         self._status = status
 
 
-class Hotwater(_DeviceBase):  # Hotwater version of a Device
+class HotWater(_DeviceBase):  # Hotwater version of a Device
     """Instance of a location's DHW zone."""
 
     _config: Final[EvoDevInfoDictT]  # type: ignore[misc]
@@ -269,7 +269,7 @@ class ControlSystem(_EntityBase):  # TCS portion of a Location
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
 
-        self.hotwater: Hotwater | None = None
+        self.hotwater: HotWater | None = None
         self.zones: list[Zone] = []
 
         self.zone_by_id: dict[str, Zone] = {}  # id is fixed to zone
@@ -352,7 +352,7 @@ def _get_zone(self, zon_id: int | str) -> Zone:
 
         return dev
 
-    def _get_dhw(self) -> Hotwater:
+    def _get_dhw(self) -> HotWater:
         """Return the TCS's DHW, if there is one."""
 
         dev = self.zone_by_id.get("HW")
@@ -416,7 +416,7 @@ def __init__(self, client: EvohomeClient, config: EvoTcsInfoDictT) -> None:
                 self.gateway_by_id[gwy.id] = gwy
 
             if dev_config["thermostat_model_type"] == "DOMESTIC_HOT_WATER":
-                self.hotwater = Hotwater(self, dev_config)
+                self.hotwater = HotWater(self, dev_config)
 
             elif dev_config["thermostat_model_type"].startswith("EMEA_"):
                 self._add_zone(Zone(self, dev_config))

diff --git a/src/evohomeasync/exceptions.py b/src/evohomeasync/exceptions.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from evohome.exceptions import (  # noqa: F401
+from evohome.exceptions import (
     ApiRateLimitExceededError,
     ApiRequestFailedError,
     AuthenticationFailedError,
@@ -18,3 +18,20 @@
     NoSingleTcsError,
     StatusError,
 )
+
+__all__ = [
+    "ApiRateLimitExceededError",
+    "ApiRequestFailedError",
+    "AuthenticationFailedError",
+    "BadApiRequestError",
+    "BadApiResponseError",
+    "BadApiSchemaError",
+    "BadScheduleUploadedError",
+    "ConfigError",
+    "EvohomeError",
+    "InvalidConfigError",
+    "InvalidScheduleError",
+    "InvalidStatusError",
+    "NoSingleTcsError",
+    "StatusError",
+]
diff --git a/src/evohomeasync2/__init__.py b/src/evohomeasync2/__init__.py
@@ -12,8 +12,8 @@
 import aiohttp
 
 from .auth import AbstractTokenManager
-from .control_system import ControlSystem  # noqa: F401
-from .exceptions import (  # noqa: F401
+from .control_system import ControlSystem
+from .exceptions import (
     ApiRateLimitExceededError,
     ApiRequestFailedError,
     AuthenticationFailedError,
@@ -29,11 +29,11 @@
     NoSingleTcsError,
     StatusError,
 )
-from .gateway import Gateway  # noqa: F401
-from .hotwater import HotWater  # noqa: F401
-from .location import Location  # noqa: F401
+from .gateway import Gateway
+from .hotwater import HotWater
+from .location import Location
 from .main import EvohomeClient
-from .zone import Zone  # noqa: F401
+from .zone import Zone
 
 __version__ = "1.2.0"
 
@@ -119,3 +119,30 @@ def refresh_token(self) -> str:
     def username(self) -> str:
         """Return the username attr."""
         return self._token_manager.client_id
+
+
+__all__ = [  # noqa: RUF022
+    "EvohomeClient",
+    "AbstractTokenManager",
+    #
+    "Location",
+    "Gateway",
+    "ControlSystem",
+    "Zone",
+    "HotWater",
+    #
+    "ApiRateLimitExceededError",
+    "ApiRequestFailedError",
+    "AuthenticationFailedError",
+    "BadApiRequestError",
+    "BadApiResponseError",
+    "BadApiSchemaError",
+    "BadScheduleUploadedError",
+    "ConfigError",
+    "EvohomeError",
+    "InvalidConfigError",
+    "InvalidScheduleError",
+    "InvalidStatusError",
+    "NoSingleTcsError",
+    "StatusError",
+]
diff --git a/src/evohomeasync2/exceptions.py b/src/evohomeasync2/exceptions.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from evohome.exceptions import (  # noqa: F401
+from evohome.exceptions import (
     ApiRateLimitExceededError,
     ApiRequestFailedError,
     AuthenticationFailedError,
@@ -18,3 +18,20 @@
     NoSingleTcsError,
     StatusError,
 )
+
+__all__ = [
+    "ApiRateLimitExceededError",
+    "ApiRequestFailedError",
+    "AuthenticationFailedError",
+    "BadApiRequestError",
+    "BadApiResponseError",
+    "BadApiSchemaError",
+    "BadScheduleUploadedError",
+    "ConfigError",
+    "EvohomeError",
+    "InvalidConfigError",
+    "InvalidScheduleError",
+    "InvalidStatusError",
+    "NoSingleTcsError",
+    "StatusError",
+]