Sorting, use _request

Author: bouwew

plugwise/__init__.py

@@ -52,7 +52,6 @@ def __init__(
         username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
-
         self._timeout = DEFAULT_LEGACY_TIMEOUT
         super().__init__(
             host,
@@ -149,15 +148,15 @@ async def connect(self) -> Version | None:
 
         self._smile_api = (
             SmileAPI(
-                self._request,
-                self.cooling_present,
                 self._elga,
                 self._is_thermostat,
                 self._last_active,
                 self._loc_data,
                 self._on_off_device,
                 self._opentherm_device,
+                self._request,
                 self._schedule_old_states,
+                self.cooling_present,
                 self.gw_data,
                 self.smile_hostname,
                 self.smile_hw_version,
@@ -170,11 +169,11 @@ async def connect(self) -> Version | None:
             )
             if not self.smile_legacy
             else SmileLegacyAPI(
-                self._request,
                 self._is_thermostat,
                 self._loc_data,
                 self._on_off_device,
                 self._opentherm_device,
+                self._request,
                 self._stretch_v2,
                 self._target_smile,
                 self.gw_data,

plugwise/legacy/smile.py

@@ -37,11 +37,11 @@ class SmileLegacyAPI(SmileLegacyData):
 
     def __init__(
         self,
-        request: Callable[..., Awaitable[Any]],
         _is_thermostat: bool,
         _loc_data: dict[str, ThermoLoc],
         _on_off_device: bool,
         _opentherm_device: bool,
+        _request: Callable[..., Awaitable[Any]],
         _stretch_v2: bool,
         _target_smile: str,
         gw_data: GatewayData,
@@ -59,11 +59,11 @@ def __init__(
         self._loc_data = _loc_data
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
+        self._request = _request
         self._stretch_v2 = _stretch_v2
         self._target_smile = _target_smile
         self.cooling_present = False
         self.gw_data = gw_data
-        self.request = request
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address
@@ -78,12 +78,12 @@ def __init__(
 
     async def full_xml_update(self) -> None:
         """Perform a first fetch of the Plugwise server XML data."""
-        self._domain_objects = await self.request(DOMAIN_OBJECTS)
-        self._locations = await self.request(LOCATIONS)
-        self._modules = await self.request(MODULES)
+        self._domain_objects = await self._request(DOMAIN_OBJECTS)
+        self._locations = await self._request(LOCATIONS)
+        self._modules = await self._request(MODULES)
         # P1 legacy has no appliances
         if self.smile_type != "power":
-            self._appliances = await self.request(APPLIANCES)
+            self._appliances = await self._request(APPLIANCES)
 
     def get_all_gateway_entities(self) -> None:
         """Collect the Plugwise gateway entities and their data and states from the received raw XML-data.
@@ -123,12 +123,12 @@ async def async_update(self) -> PlugwiseData:
                 ) from err
         else:
             try:
-                self._domain_objects = await self.request(DOMAIN_OBJECTS)
+                self._domain_objects = await self._request(DOMAIN_OBJECTS)
                 match self._target_smile:
                     case "smile_v2":
-                        self._modules = await self.request(MODULES)
+                        self._modules = await self._request(MODULES)
                     case self._target_smile if self._target_smile in REQUIRE_APPLIANCES:
-                        self._appliances = await self.request(APPLIANCES)
+                        self._appliances = await self._request(APPLIANCES)
 
                 self._update_gw_entities()
                 # Detect failed data-retrieval
@@ -300,6 +300,6 @@ async def call_request(self, uri: str, **kwargs: Any) -> None:
         method: str = kwargs["method"]
         data: str | None = kwargs.get("data")
         try:
-            await self.request(uri, method=method, data=data)
+            await self._request(uri, method=method, data=data)
         except ConnectionFailedError as exc:
             raise ConnectionFailedError from exc

plugwise/smile.py

@@ -44,15 +44,15 @@ class SmileAPI(SmileData):
 
     def __init__(
         self,
-        request: Callable[..., Awaitable[Any]],
-        cooling_present: bool,
         _elga: bool,
         _is_thermostat: bool,
         _last_active: dict[str, str | None],
         _loc_data: dict[str, ThermoLoc],
         _on_off_device: bool,
         _opentherm_device: bool,
+        _request: Callable[..., Awaitable[Any]],
         _schedule_old_states: dict[str, dict[str, str]],
+        cooling_present: bool,
         gw_data: GatewayData,
         smile_hostname: str | None,
         smile_hw_version: str | None,
@@ -65,7 +65,6 @@ def __init__(
     ) -> None:
         """Set the constructor for this class."""
         self._cooling_enabled = False
-        self.cooling_present = cooling_present
         self._elga = _elga
         self._gateway_id: str = NONE
         self._heater_id: str = NONE
@@ -74,9 +73,10 @@ def __init__(
         self._loc_data = _loc_data
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
+        self._request = _request
         self._schedule_old_states = _schedule_old_states
+        self.cooling_present = cooling_present
         self.gw_data = gw_data
-        self.request = request
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address
@@ -90,7 +90,7 @@ def __init__(
 
     async def full_xml_update(self) -> None:
         """Perform a first fetch of the Plugwise server XML data."""
-        self._domain_objects = await self.request(DOMAIN_OBJECTS)
+        self._domain_objects = await self._request(DOMAIN_OBJECTS)
         self._get_plugwise_notifications()
 
     def get_all_gateway_entities(self) -> None:
@@ -469,6 +469,6 @@ async def call_request(self, uri: str, **kwargs: Any) -> None:
         method: str = kwargs["method"]
         data: str | None = kwargs.get("data")
         try:
-            await self.request(uri, method=method, data=data)
+            await self._request(uri, method=method, data=data)
         except ConnectionFailedError as exc:
             raise ConnectionFailedError from exc