dirigera 1.2.7__tar.gz → 1.3.0__tar.gz

{dirigera-1.2.7/src/dirigera.egg-info → dirigera-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirigera
-Version: 1.2.7
+Version: 1.3.0
 Summary: An unofficial Python client for controlling the IKEA Dirigera Smart Home Hub
 Author-email: Leggin <legginsun@gmail.com>
 License: MIT License
@@ -74,6 +74,7 @@ This repository provides an unofficial Python client for controlling the IKEA Di
     - [Creating a Scene](#creating-a-scene)
   - [Motion Sensor](#motion-sensor)
   - [Open Close Sensor](#open-close-sensor)
+  - [Electrical Sensor](#electrical-sensor)
   - [Event Listener](#event-listener)
   - [Motivation](#motivation)
   - [Contributing](#contributing)
@@ -144,6 +145,9 @@ response = dirigera_hub.delete(route="/scenes/1")
 # Fetch all air purifiers registered in the hub
 air_purifiers = dirigera_hub.get_air_purifiers()
 
+# Fetch an air purifier by its name
+air_purifier = dirigera_hub.get_air_purifier_by_name(air_purifier_name="living room air purifier")
+
 # Fetch an air purifier by its ID
 air_purifier = dirigera_hub.get_air_purifier_by_id(id_="1")
 
@@ -168,6 +172,9 @@ outlet = dirigera_hub.get_outlet_by_id(id_="1")
 # Fetch all environment sensors registered in the hub
 sensors = dirigera_hub.get_environment_sensors()
 
+# Fetch an environment sensor by its name
+sensor = dirigera_hub.get_environment_sensor_by_name(environment_sensor_name="living room environment sensor")
+
 # Fetch an environment sensor by its ID
 sensor = dirigera_hub.get_environment_sensor_by_id(id_="1")
 
@@ -183,6 +190,9 @@ sensor = dirigera_hub.get_motion_sensor_by_id(id_="1")
 # Fetch all open/close sensors registered in the hub
 sensors = dirigera_hub.get_open_close_sensors()
 
+# Fetch an open/close sensor by its name
+sensor = dirigera_hub.get_open_close_sensor_by_name(open_close_sensor_name="front door sensor")
+
 # Fetch an open/close sensor by its ID
 sensor = dirigera_hub.get_open_close_by_id(id_="1")
 
@@ -210,24 +220,42 @@ scenes = dirigera_hub.get_scenes()
 # Fetch a scene by its ID
 scene = dirigera_hub.get_scene_by_id(scene_id="1")
 
+# Fetch a scene by its name
+scene = dirigera_hub.get_scene_by_name(scene_name="movie night")
+
 # Fetch all water sensors registered in the hub
 water_sensors = dirigera_hub.get_water_sensors()
 
+# Fetch a water sensor by its name
+water_sensor = dirigera_hub.get_water_sensor_by_name(water_sensor_name="bathroom water sensor")
+
 # Fetch a water sensor by its ID
 water_sensor = dirigera_hub.get_water_sensor_by_id(id_="1")
 
 # Fetch all occupancy sensors registered in the hub
 occupancy_sensors = dirigera_hub.get_occupancy_sensors()
 
+# Fetch an occupancy sensor by its name
+occupancy_sensor = dirigera_hub.get_occupancy_sensor_by_name(occupancy_sensor_name="hallway occupancy sensor")
+
 # Fetch an occupancy sensor by its ID
 occupancy_sensor = dirigera_hub.get_occupancy_sensor_by_id(id_="1")
 
 # Fetch all light sensors registered in the hub
 light_sensors = dirigera_hub.get_light_sensors()
 
+# Fetch a light sensor by its name
+light_sensor = dirigera_hub.get_light_sensor_by_name(light_sensor_name="living room light sensor")
+
 # Fetch a light sensor by its ID
 light_sensor = dirigera_hub.get_light_sensor_by_id(id_="1")
 
+# Fetch all electrical sensors registered in the hub
+electrical_sensors = dirigera_hub.get_electrical_sensors()
+
+# Fetch an electrical sensor by its ID
+electrical_sensor = dirigera_hub.get_electrical_sensor_by_id(id_="1")
+
 # Fetch all devices registered in the hub
 devices = dirigera_hub.get_all_devices()
 
@@ -247,7 +275,8 @@ dirigera_hub.delete_scene(scene_id="1")
 
 # [Devices](./src/dirigera/devices/device.py)
 
-All available devices (Light, Controller, Outlet, ...) consist of the core data defined in [device.py](./src/dirigera/devices/device.py):
+All available devices (Light, Controller, Outlet, ...) consist of the core data defined in [device.py](./src/dirigera/devices/device.py).
+Calling `reload()` on a device (or scene) fetches the current data from the hub and updates the object in place. It also returns the same object, so `light = light.reload()` works as well.
 
 ### Core Device Data
 
@@ -324,7 +353,7 @@ light_level: Optional[int] = None
 color_temperature: Optional[int] = None
 color_temperature_min: Optional[int] = None
 color_temperature_max: Optional[int] = None
-color_hue: Optional[int] = None
+color_hue: Optional[float] = None
 color_saturation: Optional[float] = None
 ```
 
@@ -381,7 +410,7 @@ time_of_last_energy_reset: Optional[datetime.datetime] = None
 Available methods for outlet are:
 
 ```python
-# Reload the air outlet data from the hub
+# Reload the outlet data from the hub
 outlet.reload()
 
 # Set the name of the outlet
@@ -417,7 +446,7 @@ filter_lifetime: int
 current_p_m25: int
 ```
 
-Available methods for blinds are:
+Available methods for air purifier are:
 
 ```python
 # Reload the air purifier data from the hub
@@ -467,6 +496,9 @@ blind.set_name(name="kitchen blind 1")
 
 # Set the target level of the blind (0-100)
 blind.set_target_level(target_level=90)
+
+# Move the blind up or down, or stop it at its current position
+blind.set_state(state=BlindsStateEnum.STOPPED)
 ```
 
 ## [Remote Controllers](./src/dirigera/devices/controller.py)
@@ -549,7 +581,7 @@ created_at: datetime.datetime
 last_completed: Optional[datetime.datetime] = None
 last_triggered: Optional[datetime.datetime] = None
 last_undo: Optional[datetime.datetime] = None
-commands: List[str]
+commands: List[Union[str, Dict[str, Any]]]
 undo_allowed_duration: int
 ```
 
@@ -633,7 +665,7 @@ All available icons can be found here: [Icons](./src/dirigera/devices/scene.py)
 To get information about the available motion sensors, you can use the `get_motion_sensors()` method:
 
 ```python
-motions_sensors = dirigera_hub.get_motion_sensors()
+motion_sensors = dirigera_hub.get_motion_sensors()
 ```
 
 The motion sensor object has the following attributes (additional to the core attributes):
@@ -645,7 +677,7 @@ light_level: Optional[float] = None
 is_detected: Optional[bool] = False
 ```
 
-Available methods for outlet are:
+Available methods for motion sensor are:
 
 ```python
 # Reload the motion sensor data from the hub
@@ -663,6 +695,8 @@ To get information about the available open/close sensors, you can use the `get_
 open_close_sensors = dirigera_hub.get_open_close_sensors()
 ```
 
+The hub does not guarantee the order of the returned devices, so look sensors up by their id (`get_open_close_by_id()`) or name (`get_open_close_sensor_by_name()`) instead of by their position in the list.
+
 The open_close_sensor object has the following attributes (additional to the core attributes):
 
 ```python
@@ -670,7 +704,7 @@ is_open: bool
 battery_percentage: Optional[int] = None
 ```
 
-Available methods for outlet are:
+Available methods for open/close sensor are:
 
 ```python
 # Reload the open/close sensor data from the hub
@@ -680,6 +714,50 @@ open_close_sensor.reload()
 open_close_sensor.set_name(name="window 1")
 ```
 
+## [Electrical Sensor](./src/dirigera/devices/electrical_sensor.py)
+
+Plugs with energy metering, like the GRILLPLATS plug, are reported by the hub as two devices that share the same `relation_id`: an outlet (`isOn`, startup behaviour, ...) and an electrical sensor that holds the metering values.
+
+To get the electrical sensors use:
+
+```python
+electrical_sensors = dirigera_hub.get_electrical_sensors()
+```
+
+The electrical sensor object has the following attributes (additional to the core attributes):
+
+```python
+current_active_power: Optional[float] = None
+current_amps: Optional[float] = None
+current_voltage: Optional[float] = None
+energy_consumed_at_last_reset: Optional[float] = None
+total_energy_consumed: Optional[float] = None
+total_energy_consumed_last_updated: Optional[datetime.datetime] = None
+time_of_last_energy_reset: Optional[datetime.datetime] = None
+```
+
+Available methods for electrical sensor are:
+
+```python
+# Reload the electrical sensor data from the hub
+electrical_sensor.reload()
+
+# Set the name of the electrical sensor
+electrical_sensor.set_name(name="grill plug")
+```
+
+To find the electrical sensor that belongs to an outlet, compare their `relation_id`:
+
+```python
+outlet = dirigera_hub.get_outlet_by_name(outlet_name="grill plug")
+electrical_sensor = next(
+    sensor
+    for sensor in dirigera_hub.get_electrical_sensors()
+    if sensor.relation_id == outlet.relation_id
+)
+print(electrical_sensor.attributes.current_active_power)
+```
+
 ## Event Listener
 
 The event listener allows you to listen to events that are published by your Dirigera hub. This is useful if you want to automate tasks based on events such as when a light is turned on or off, or when the color temperature of a light is changed.
@@ -692,8 +770,8 @@ from typing import Any
 def on_message(ws: Any, message: str):
     message_dict = json.loads(message)
     data = message_dict["data"]
-    if data["id"] == bed_light.light_id:
-        print(f"{message_dict['type']} event on {bed_light.custom_name}, attributes: {data['attributes']}")
+    if data["id"] == bed_light.id:
+        print(f"{message_dict['type']} event on {bed_light.attributes.custom_name}, attributes: {data['attributes']}")
 
 def on_error(ws: Any, message: str):
     print(message)
@@ -707,6 +785,28 @@ dirigera_hub.create_event_listener(
 deviceStateChanged event on Bed Light, attributes: {'isOn': False}
 ```
 
+### Reconnecting
+
+The hub can close the connection on its own (status 1000, "disconnected due to inactivity."). When that happens, `create_event_listener()` returns. The `reconnect` argument doesn't restart it, since it only covers connection errors and not a clean close by the hub. To keep listening, call it in a loop:
+
+```python
+import time
+
+running = True
+
+def stop_listening():
+    # create_event_listener() blocks, so call this from another thread
+    global running
+    running = False
+    dirigera_hub.stop_event_listener()
+
+while running:
+    dirigera_hub.create_event_listener(on_message=on_message, on_error=on_error)
+    time.sleep(5)  # short backoff before listening again
+```
+
+Events that happen while the listener is reconnecting are missed, so re-fetch the device state after reconnecting if you need it (for example in `on_open`).
+
 ## Motivation
 
 The primary motivation for this project was to provide users with the ability to control the startup behavior of their smart home lamps when there is a power outage.  

{dirigera-1.2.7 → dirigera-1.3.0}/README.md

@@ -26,6 +26,7 @@ This repository provides an unofficial Python client for controlling the IKEA Di
     - [Creating a Scene](#creating-a-scene)
   - [Motion Sensor](#motion-sensor)
   - [Open Close Sensor](#open-close-sensor)
+  - [Electrical Sensor](#electrical-sensor)
   - [Event Listener](#event-listener)
   - [Motivation](#motivation)
   - [Contributing](#contributing)
@@ -96,6 +97,9 @@ response = dirigera_hub.delete(route="/scenes/1")
 # Fetch all air purifiers registered in the hub
 air_purifiers = dirigera_hub.get_air_purifiers()
 
+# Fetch an air purifier by its name
+air_purifier = dirigera_hub.get_air_purifier_by_name(air_purifier_name="living room air purifier")
+
 # Fetch an air purifier by its ID
 air_purifier = dirigera_hub.get_air_purifier_by_id(id_="1")
 
@@ -120,6 +124,9 @@ outlet = dirigera_hub.get_outlet_by_id(id_="1")
 # Fetch all environment sensors registered in the hub
 sensors = dirigera_hub.get_environment_sensors()
 
+# Fetch an environment sensor by its name
+sensor = dirigera_hub.get_environment_sensor_by_name(environment_sensor_name="living room environment sensor")
+
 # Fetch an environment sensor by its ID
 sensor = dirigera_hub.get_environment_sensor_by_id(id_="1")
 
@@ -135,6 +142,9 @@ sensor = dirigera_hub.get_motion_sensor_by_id(id_="1")
 # Fetch all open/close sensors registered in the hub
 sensors = dirigera_hub.get_open_close_sensors()
 
+# Fetch an open/close sensor by its name
+sensor = dirigera_hub.get_open_close_sensor_by_name(open_close_sensor_name="front door sensor")
+
 # Fetch an open/close sensor by its ID
 sensor = dirigera_hub.get_open_close_by_id(id_="1")
 
@@ -162,24 +172,42 @@ scenes = dirigera_hub.get_scenes()
 # Fetch a scene by its ID
 scene = dirigera_hub.get_scene_by_id(scene_id="1")
 
+# Fetch a scene by its name
+scene = dirigera_hub.get_scene_by_name(scene_name="movie night")
+
 # Fetch all water sensors registered in the hub
 water_sensors = dirigera_hub.get_water_sensors()
 
+# Fetch a water sensor by its name
+water_sensor = dirigera_hub.get_water_sensor_by_name(water_sensor_name="bathroom water sensor")
+
 # Fetch a water sensor by its ID
 water_sensor = dirigera_hub.get_water_sensor_by_id(id_="1")
 
 # Fetch all occupancy sensors registered in the hub
 occupancy_sensors = dirigera_hub.get_occupancy_sensors()
 
+# Fetch an occupancy sensor by its name
+occupancy_sensor = dirigera_hub.get_occupancy_sensor_by_name(occupancy_sensor_name="hallway occupancy sensor")
+
 # Fetch an occupancy sensor by its ID
 occupancy_sensor = dirigera_hub.get_occupancy_sensor_by_id(id_="1")
 
 # Fetch all light sensors registered in the hub
 light_sensors = dirigera_hub.get_light_sensors()
 
+# Fetch a light sensor by its name
+light_sensor = dirigera_hub.get_light_sensor_by_name(light_sensor_name="living room light sensor")
+
 # Fetch a light sensor by its ID
 light_sensor = dirigera_hub.get_light_sensor_by_id(id_="1")
 
+# Fetch all electrical sensors registered in the hub
+electrical_sensors = dirigera_hub.get_electrical_sensors()
+
+# Fetch an electrical sensor by its ID
+electrical_sensor = dirigera_hub.get_electrical_sensor_by_id(id_="1")
+
 # Fetch all devices registered in the hub
 devices = dirigera_hub.get_all_devices()
 
@@ -199,7 +227,8 @@ dirigera_hub.delete_scene(scene_id="1")
 
 # [Devices](./src/dirigera/devices/device.py)
 
-All available devices (Light, Controller, Outlet, ...) consist of the core data defined in [device.py](./src/dirigera/devices/device.py):
+All available devices (Light, Controller, Outlet, ...) consist of the core data defined in [device.py](./src/dirigera/devices/device.py).
+Calling `reload()` on a device (or scene) fetches the current data from the hub and updates the object in place. It also returns the same object, so `light = light.reload()` works as well.
 
 ### Core Device Data
 
@@ -276,7 +305,7 @@ light_level: Optional[int] = None
 color_temperature: Optional[int] = None
 color_temperature_min: Optional[int] = None
 color_temperature_max: Optional[int] = None
-color_hue: Optional[int] = None
+color_hue: Optional[float] = None
 color_saturation: Optional[float] = None
 ```
 
@@ -333,7 +362,7 @@ time_of_last_energy_reset: Optional[datetime.datetime] = None
 Available methods for outlet are:
 
 ```python
-# Reload the air outlet data from the hub
+# Reload the outlet data from the hub
 outlet.reload()
 
 # Set the name of the outlet
@@ -369,7 +398,7 @@ filter_lifetime: int
 current_p_m25: int
 ```
 
-Available methods for blinds are:
+Available methods for air purifier are:
 
 ```python
 # Reload the air purifier data from the hub
@@ -419,6 +448,9 @@ blind.set_name(name="kitchen blind 1")
 
 # Set the target level of the blind (0-100)
 blind.set_target_level(target_level=90)
+
+# Move the blind up or down, or stop it at its current position
+blind.set_state(state=BlindsStateEnum.STOPPED)
 ```
 
 ## [Remote Controllers](./src/dirigera/devices/controller.py)
@@ -501,7 +533,7 @@ created_at: datetime.datetime
 last_completed: Optional[datetime.datetime] = None
 last_triggered: Optional[datetime.datetime] = None
 last_undo: Optional[datetime.datetime] = None
-commands: List[str]
+commands: List[Union[str, Dict[str, Any]]]
 undo_allowed_duration: int
 ```
 
@@ -585,7 +617,7 @@ All available icons can be found here: [Icons](./src/dirigera/devices/scene.py)
 To get information about the available motion sensors, you can use the `get_motion_sensors()` method:
 
 ```python
-motions_sensors = dirigera_hub.get_motion_sensors()
+motion_sensors = dirigera_hub.get_motion_sensors()
 ```
 
 The motion sensor object has the following attributes (additional to the core attributes):
@@ -597,7 +629,7 @@ light_level: Optional[float] = None
 is_detected: Optional[bool] = False
 ```
 
-Available methods for outlet are:
+Available methods for motion sensor are:
 
 ```python
 # Reload the motion sensor data from the hub
@@ -615,6 +647,8 @@ To get information about the available open/close sensors, you can use the `get_
 open_close_sensors = dirigera_hub.get_open_close_sensors()
 ```
 
+The hub does not guarantee the order of the returned devices, so look sensors up by their id (`get_open_close_by_id()`) or name (`get_open_close_sensor_by_name()`) instead of by their position in the list.
+
 The open_close_sensor object has the following attributes (additional to the core attributes):
 
 ```python
@@ -622,7 +656,7 @@ is_open: bool
 battery_percentage: Optional[int] = None
 ```
 
-Available methods for outlet are:
+Available methods for open/close sensor are:
 
 ```python
 # Reload the open/close sensor data from the hub
@@ -632,6 +666,50 @@ open_close_sensor.reload()
 open_close_sensor.set_name(name="window 1")
 ```
 
+## [Electrical Sensor](./src/dirigera/devices/electrical_sensor.py)
+
+Plugs with energy metering, like the GRILLPLATS plug, are reported by the hub as two devices that share the same `relation_id`: an outlet (`isOn`, startup behaviour, ...) and an electrical sensor that holds the metering values.
+
+To get the electrical sensors use:
+
+```python
+electrical_sensors = dirigera_hub.get_electrical_sensors()
+```
+
+The electrical sensor object has the following attributes (additional to the core attributes):
+
+```python
+current_active_power: Optional[float] = None
+current_amps: Optional[float] = None
+current_voltage: Optional[float] = None
+energy_consumed_at_last_reset: Optional[float] = None
+total_energy_consumed: Optional[float] = None
+total_energy_consumed_last_updated: Optional[datetime.datetime] = None
+time_of_last_energy_reset: Optional[datetime.datetime] = None
+```
+
+Available methods for electrical sensor are:
+
+```python
+# Reload the electrical sensor data from the hub
+electrical_sensor.reload()
+
+# Set the name of the electrical sensor
+electrical_sensor.set_name(name="grill plug")
+```
+
+To find the electrical sensor that belongs to an outlet, compare their `relation_id`:
+
+```python
+outlet = dirigera_hub.get_outlet_by_name(outlet_name="grill plug")
+electrical_sensor = next(
+    sensor
+    for sensor in dirigera_hub.get_electrical_sensors()
+    if sensor.relation_id == outlet.relation_id
+)
+print(electrical_sensor.attributes.current_active_power)
+```
+
 ## Event Listener
 
 The event listener allows you to listen to events that are published by your Dirigera hub. This is useful if you want to automate tasks based on events such as when a light is turned on or off, or when the color temperature of a light is changed.
@@ -644,8 +722,8 @@ from typing import Any
 def on_message(ws: Any, message: str):
     message_dict = json.loads(message)
     data = message_dict["data"]
-    if data["id"] == bed_light.light_id:
-        print(f"{message_dict['type']} event on {bed_light.custom_name}, attributes: {data['attributes']}")
+    if data["id"] == bed_light.id:
+        print(f"{message_dict['type']} event on {bed_light.attributes.custom_name}, attributes: {data['attributes']}")
 
 def on_error(ws: Any, message: str):
     print(message)
@@ -659,6 +737,28 @@ dirigera_hub.create_event_listener(
 deviceStateChanged event on Bed Light, attributes: {'isOn': False}
 ```
 
+### Reconnecting
+
+The hub can close the connection on its own (status 1000, "disconnected due to inactivity."). When that happens, `create_event_listener()` returns. The `reconnect` argument doesn't restart it, since it only covers connection errors and not a clean close by the hub. To keep listening, call it in a loop:
+
+```python
+import time
+
+running = True
+
+def stop_listening():
+    # create_event_listener() blocks, so call this from another thread
+    global running
+    running = False
+    dirigera_hub.stop_event_listener()
+
+while running:
+    dirigera_hub.create_event_listener(on_message=on_message, on_error=on_error)
+    time.sleep(5)  # short backoff before listening again
+```
+
+Events that happen while the listener is reconnecting are missed, so re-fetch the device state after reconnecting if you need it (for example in `on_open`).
+
 ## Motivation
 
 The primary motivation for this project was to provide users with the ability to control the startup behavior of their smart home lamps when there is a power outage.  

{dirigera-1.2.7 → dirigera-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dirigera"
-version = "1.2.7"
+version = "1.3.0"
 description = "An unofficial Python client for controlling the IKEA Dirigera Smart Home Hub"
 readme = "README.md"
 authors = [{ name = "Leggin", email = "legginsun@gmail.com" }]

{dirigera-1.2.7 → dirigera-1.3.0}/src/dirigera/devices/air_purifier.py

@@ -32,7 +32,8 @@ class AirPurifier(Device):
 
     def reload(self) -> AirPurifier:
         data = self.dirigera_client.get(route=f"/devices/{self.id}")
-        return AirPurifier(dirigeraClient=self.dirigera_client, **data)
+        self._copy_from(AirPurifier(dirigeraClient=self.dirigera_client, **data))
+        return self
 
     def set_name(self, name: str) -> None:
         if "customName" not in self.capabilities.can_receive:

{dirigera-1.2.7 → dirigera-1.3.0}/src/dirigera/devices/base_ikea_model.py

@@ -7,4 +7,7 @@ def to_camel(string: str) -> str:
 
 
 class BaseIkeaModel(BaseModel, arbitrary_types_allowed=True, alias_generator=to_camel):
-    pass
+    def _copy_from(self, other: "BaseIkeaModel") -> None:
+        """Overwrite all fields of this instance with the values of another one."""
+        for name in type(self).model_fields:
+            setattr(self, name, getattr(other, name))

{dirigera-1.2.7 → dirigera-1.3.0}/src/dirigera/devices/blinds.py

@@ -1,9 +1,16 @@
 from __future__ import annotations
+from enum import Enum
 from typing import Any, Optional, Dict
 from .device import Attributes, Device
 from ..hub.abstract_smart_home_hub import AbstractSmartHomeHub
 
 
+class BlindsStateEnum(Enum):
+    UP = "up"
+    DOWN = "down"
+    STOPPED = "stopped"
+
+
 class BlindAttributes(Attributes):
     blinds_current_level: Optional[int] = None
     blinds_target_level: Optional[int] = None
@@ -17,7 +24,8 @@ class Blind(Device):
 
     def reload(self) -> Blind:
         data = self.dirigera_client.get(route=f"/devices/{self.id}")
-        return Blind(dirigeraClient=self.dirigera_client, **data)
+        self._copy_from(Blind(dirigeraClient=self.dirigera_client, **data))
+        return self
 
     def set_name(self, name: str) -> None:
         if "customName" not in self.capabilities.can_receive:
@@ -40,6 +48,14 @@ class Blind(Device):
         self.dirigera_client.patch(route=f"/devices/{self.id}", data=data)
         self.attributes.blinds_target_level = target_level
 
+    def set_state(self, state: BlindsStateEnum) -> None:
+        if "blindsState" not in self.capabilities.can_receive:
+            raise AssertionError("This blind does not support the state function")
+
+        data = [{"attributes": {"blindsState": state.value}}]
+        self.dirigera_client.patch(route=f"/devices/{self.id}", data=data)
+        self.attributes.blinds_state = state.value
+
 
 def dict_to_blind(data: Dict[str, Any], dirigera_client: AbstractSmartHomeHub) -> Blind:
     return Blind(dirigeraClient=dirigera_client, **data)

{dirigera-1.2.7 → dirigera-1.3.0}/src/dirigera/devices/controller.py

@@ -16,7 +16,8 @@ class Controller(Device):
 
     def reload(self) -> Controller:
         data = self.dirigera_client.get(route=f"/devices/{self.id}")
-        return Controller(dirigeraClient=self.dirigera_client, **data)
+        self._copy_from(Controller(dirigeraClient=self.dirigera_client, **data))
+        return self
 
     def set_name(self, name: str) -> None:
         if "customName" not in self.capabilities.can_receive:

{dirigera-1.2.7 → dirigera-1.3.0}/src/dirigera/devices/device.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import datetime
 from enum import Enum
-from typing import Any, Dict, Optional, List
+from typing import Optional, List
 from .base_ikea_model import BaseIkeaModel
 
 
@@ -54,6 +54,3 @@ class Device(BaseIkeaModel):
     device_set: List
     remote_links: List[str]
     is_hidden: Optional[bool] = None
-
-    def _reload(self, data: Dict[str, Any]) -> Device:
-        return Device(**data)

dirigera-1.3.0/src/dirigera/devices/electrical_sensor.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+import datetime
+from typing import Any, Dict, Optional
+from .device import Attributes, Device
+from ..hub.abstract_smart_home_hub import AbstractSmartHomeHub
+
+
+class ElectricalSensorAttributes(Attributes):
+    current_active_power: Optional[float] = None
+    current_amps: Optional[float] = None
+    current_voltage: Optional[float] = None
+    energy_consumed_at_last_reset: Optional[float] = None
+    total_energy_consumed: Optional[float] = None
+    total_energy_consumed_last_updated: Optional[datetime.datetime] = None
+    time_of_last_energy_reset: Optional[datetime.datetime] = None
+
+
+class ElectricalSensor(Device):
+    dirigera_client: AbstractSmartHomeHub
+    attributes: ElectricalSensorAttributes
+
+    def reload(self) -> ElectricalSensor:
+        data = self.dirigera_client.get(route=f"/devices/{self.id}")
+        self._copy_from(ElectricalSensor(dirigeraClient=self.dirigera_client, **data))
+        return self
+
+    def set_name(self, name: str) -> None:
+        if "customName" not in self.capabilities.can_receive:
+            raise AssertionError("This sensor does not support the set_name function")
+
+        data = [{"attributes": {"customName": name}}]
+        self.dirigera_client.patch(route=f"/devices/{self.id}", data=data)
+        self.attributes.custom_name = name
+
+
+def dict_to_electrical_sensor(
+    data: Dict[str, Any], dirigera_client: AbstractSmartHomeHub
+) -> ElectricalSensor:
+    return ElectricalSensor(dirigeraClient=dirigera_client, **data)

{dirigera-1.2.7 → dirigera-1.3.0}/src/dirigera/devices/environment_sensor.py

@@ -24,7 +24,8 @@ class EnvironmentSensor(Device):
 
     def reload(self) -> EnvironmentSensor:
         data = self.dirigera_client.get(route=f"/devices/{self.id}")
-        return EnvironmentSensor(dirigeraClient=self.dirigera_client, **data)
+        self._copy_from(EnvironmentSensor(dirigeraClient=self.dirigera_client, **data))
+        return self
 
     def set_name(self, name: str) -> None:
         if "customName" not in self.capabilities.can_receive: