Resolve state/last_state issues

- Fix type object singleton issues
- Add deep copy functionality to new_object
- Ensure proper isolation between current and last values

Author: epdevlab

inelsmqtt/devices/__init__.py

@@ -18,7 +18,14 @@
     TOPIC_FRAGMENTS,
     VERSION,
 )
-from inelsmqtt.utils.core import DUMMY_VAL, DeviceClassProtocol, DeviceTypeNotFound, DeviceValue, ProtocolHandlerMapper
+from inelsmqtt.utils.core import (
+    DUMMY_VAL,
+    DeviceClassProtocol,
+    DeviceTypeNotFound,
+    DeviceValue,
+    LastHAValue,
+    ProtocolHandlerMapper,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -234,24 +241,23 @@ def values(self) -> Optional[DeviceValue]:
         return self.__values
 
     @property
-    def last_values(self) -> DeviceValue:
+    def last_values(self) -> LastHAValue:
         """Get last value of the device
 
         Returns:
-            DeviceValue: latest values in many formats
+            LastHAValue: Container for the previous Home Assistant value.
         """
-        try:
-            if hasattr(self.__values.last_value.ha_value, "__dict__"):
-                return self.__values.last_value
-            raise AttributeError
-        except AttributeError:
+        if self.__values:  # previous state exists
+            return self.__values.last_value
+        else:
             val = self.__mqtt.last_value(self.__state_topic)
-            return DeviceValue(
+            device_value = DeviceValue(
                 self.__device_type,
                 self.__inels_type,
                 self.__device_class,
                 inels_value=val.decode() if val is not None else None,  # type: ignore[attr-defined]
             )
+            return LastHAValue(device_value.ha_value)
 
     @property
     def mqtt(self) -> InelsMqtt:
@@ -270,10 +276,9 @@ def __get_value(self, val: Any) -> DeviceValue:
             self.__inels_type,
             self.__device_class,
             inels_value=(val.decode() if val is not None else None),
-            # last_value=self.last_values,
-            last_value=self.__values,  # because it is already the last value at this moment
+            last_value=LastHAValue(self.__values.ha_value) if self.__values else self.last_values,
         )
-        self.__state = dev_value.ha_value
+        self.__state = dev_value.ha_value.copy() if dev_value.ha_value is not DUMMY_VAL else DUMMY_VAL
         self.__values = dev_value
 
         return dev_value
@@ -302,12 +307,11 @@ def set_ha_value(self, value: Any) -> bool:
             self.__inels_type,
             self.__device_class,
             ha_value=value,
-            # last_value=self.__state,
-            last_value=self.__values,  # because the last_value will be accessible
+            last_value=LastHAValue(self.__values.ha_value if self.__values else None),
         )
 
-        self.__state = dev.ha_value
-        self.__values = dev
+        # self.__state = dev.ha_value
+        # self.__values = dev
 
         ret = False
         if self.__set_topic is not None:

inelsmqtt/utils/common.py

@@ -1,3 +1,4 @@
+import copy
 import json
 from dataclasses import dataclass
 from operator import itemgetter
@@ -96,7 +97,15 @@ class DALILight(SimpleLight):
 
 def new_object(**kwargs: Any) -> Any:
     """Create new anonymous object."""
-    return type("Object", (), kwargs)
+    cls = type("Object", (), kwargs)
+    cls.copy = staticmethod(
+        lambda: type(
+            "Object",
+            (),
+            copy.deepcopy({k: v for k, v in dict(cls.__dict__).items() if not k.startswith("__") and k != "copy"}),
+        )
+    )
+    return cls
 
 
 def break_into_bytes(line: str) -> List[str]:

inelsmqtt/utils/core.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+from dataclasses import dataclass
 from typing import Any, List, Optional, Protocol
 
 from inelsmqtt.protocols import cu3, elanrf
@@ -149,6 +150,13 @@ def get_handler(device_type: str) -> type[DeviceClassProtocol]:
         return handler
 
 
+@dataclass
+class LastHAValue:
+    """Store the last known ha_value without creating reference chains."""
+
+    ha_value: Any
+
+
 class DeviceValue:
     """Device value interpretation object."""
 

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name="elkoep-mqtt",
-    version="0.2.33.beta.15",
+    version="0.2.33.beta.16",
     url="https://github.com/epdevlab/elkoep-mqtt",
     license="MIT",
     author="Elko EP s.r.o.",