Release v2.0.0

custom_components/ha_text_ai/coordinator.py

@@ -563,7 +563,8 @@ class HATextAICoordinator(DataUpdateCoordinator):
         """Return the last response."""
         if not self._responses:
             return None
-        return next(iter(self._responses.values()))
+
+        return list(self._responses.values())[-1]
 
     def reset_error_count(self) -> None:
         """Reset error counter."""

custom_components/ha_text_ai/sensor.py

@@ -17,7 +17,7 @@ from homeassistant.util import dt as dt_util
 
 from .const import (
     DOMAIN,
-    CONF_API_PROVIDER,  # Новый импорт
+    CONF_API_PROVIDER,
     ATTR_QUESTION,
     ATTR_RESPONSE,
     ATTR_LAST_UPDATED,
@@ -103,18 +103,10 @@ class HATextAISensor(CoordinatorEntity, SensorEntity):
     @property
     def state(self) -> StateType:
         """Return the state of the sensor."""
-        if not self.coordinator.data or not self.coordinator.last_update_success:
+        last_response = self.coordinator.last_response
-            return None
+        if last_response and 'timestamp' in last_response:
+            return dt_util.as_local(last_response['timestamp'])
 
-        try:
-            if self.coordinator.data and isinstance(self.coordinator.data, dict):
-                last_update = self.coordinator.data.get("last_update")
-                if isinstance(last_update, datetime):
-                    return dt_util.as_local(last_update)
-                return last_update
-            return None
-        except Exception as err:
-            _LOGGER.error("Error getting state: %s", err, exc_info=True)
         return None
 
     @property
@@ -136,58 +128,24 @@ class HATextAISensor(CoordinatorEntity, SensorEntity):
             ATTR_TOKENS_USED: self.coordinator.tokens_used,
         }
 
-        if not self.coordinator.data:
+        last_response = self.coordinator.last_response
-            return attributes
+        if last_response:
-
-        try:
-            history = list(self.coordinator._responses.items())
-            if history:
-                last_question, last_data = history[-1]
-
-                if isinstance(last_data, dict):
-                    last_response = last_data.get("response", "")
-                    last_updated = last_data.get("timestamp") or self.coordinator.data.get("last_update")
-                    response_time = last_data.get("response_time")
-
-                    model = last_data.get("model", self.coordinator.model)
-                    temperature = last_data.get("temperature", self.coordinator.temperature)
-                    max_tokens = last_data.get("max_tokens", self.coordinator.max_tokens)
-                    error = last_data.get("error")
-
-                    if error:
-                        self._last_error = error
-                        self._state = STATE_ERROR
-                else:
-                    last_response = str(last_data)
-                    last_updated = self.coordinator.data.get("last_update")
-                    response_time = None
-                    model = self.coordinator.model
-                    temperature = self.coordinator.temperature
-                    max_tokens = self.coordinator.max_tokens
-
-                if isinstance(last_updated, datetime):
-                    last_updated = dt_util.as_local(last_updated)
-
             attributes.update({
-                    ATTR_QUESTION: last_question,
+                ATTR_RESPONSE: last_response.get("response", ""),
-                    ATTR_RESPONSE: last_response,
+                ATTR_QUESTION: last_response.get("question", ""),
-                    ATTR_LAST_UPDATED: last_updated,
+                ATTR_LAST_UPDATED: last_response.get("timestamp"),
-                    ATTR_TOTAL_RESPONSES: len(history),
+                ATTR_MODEL: last_response.get("model", self.coordinator.model),
-                    ATTR_MODEL: model,
+                ATTR_TEMPERATURE: last_response.get("temperature", self.coordinator.temperature),
-                    ATTR_TEMPERATURE: temperature,
+                ATTR_MAX_TOKENS: last_response.get("max_tokens", self.coordinator.max_tokens),
-                    ATTR_MAX_TOKENS: max_tokens,
+                ATTR_RESPONSE_TIME: last_response.get("response_time"),
+                ATTR_TOTAL_RESPONSES: len(self.coordinator._responses)
             })
 
-                if response_time is not None:
+            # Обработка ошибок
-                    attributes[ATTR_RESPONSE_TIME] = response_time
+            if last_response.get("error"):
-
+                self._last_error = last_response["error"]
-            return attributes
-
-        except Exception as err:
-            _LOGGER.error("Error getting attributes: %s", err, exc_info=True)
-            self._error_count += 1
-            self._last_error = str(err)
                 self._state = STATE_ERROR
+
         return attributes
 
     @property
@@ -204,9 +162,13 @@ class HATextAISensor(CoordinatorEntity, SensorEntity):
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
         try:
-            if self.coordinator.data:
+            last_response = self.coordinator.last_response
-                if self.coordinator._is_ready:
+
-                    if self.coordinator._is_processing:
+            if last_response:
+                if last_response.get("error"):
+                    self._state = STATE_ERROR
+                    self._error_count += 1
+                elif self.coordinator._is_processing:
                     self._state = STATE_PROCESSING
                 elif self.coordinator._is_rate_limited:
                     self._state = STATE_RATE_LIMITED
@@ -216,11 +178,6 @@ class HATextAISensor(CoordinatorEntity, SensorEntity):
                     self._state = STATE_READY
             else:
                 self._state = STATE_DISCONNECTED
-            else:
-                self._state = STATE_DISCONNECTED
-
-            if self._state == STATE_ERROR:
-                self._error_count += 1
 
         except Exception as err:
             _LOGGER.error("Error handling update: %s", err, exc_info=True)