Merge pull request #2493 from cebtenzzre/fix-setstate-errcheck

fix set_state error handling

Author: acockburn

appdaemon/plugins/hass/hassplugin.py

@@ -877,7 +877,7 @@ async def set_plugin_state(
         entity_id: str,
         state: Any | None = None,
         attributes: Any | None = None,
-    ):
+    ) -> dict[str, Any] | None:
         self.logger.debug("set_plugin_state() %s %s %s %s", namespace, entity_id, state, attributes)
 
         # if we get a request for not our namespace something has gone very wrong
@@ -887,7 +887,15 @@ async def set_plugin_state(
         async def safe_set_state(self: "HassPlugin"):
             return await self.http_method("post", f"api/states/{entity_id}", state=state, attributes=attributes)
 
-        return await safe_set_state(self)
+        resp = await safe_set_state(self)
+        match resp:
+            case ClientResponseError(message=str(msg)):
+                self.logger.error("Error setting state: %s", msg)
+                return None
+            case dict():
+                return resp
+            case _:
+                return None
 
     @utils.warning_decorator(error_text="Unexpected error getting state")
     async def get_plugin_state(

appdaemon/state.py

@@ -3,13 +3,13 @@
 import threading
 import traceback
 import uuid
-from collections.abc import Mapping
+from collections.abc import Awaitable, Callable, Mapping
 from copy import copy, deepcopy
 from datetime import timedelta
 from enum import Enum
 from logging import Logger
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Awaitable, List, Literal, Optional, Protocol, Set, overload
+from typing import TYPE_CHECKING, Any, Literal, Optional, Protocol, overload
 
 from . import exceptions as ade
 from . import utils
@@ -51,7 +51,7 @@ class State:
     name: str = "_state"
     state: dict[str, dict[str, Any] | utils.PersistentDict]
 
-    app_added_namespaces: Set[str]
+    app_added_namespaces: set[str]
 
     def __init__(self, ad: "AppDaemon"):
         self.AD = ad
@@ -234,7 +234,7 @@ async def remove_persistent_namespace(self, namespace: str, state: utils.Persist
                         self.logger.error('Error removing namespace file %s: %s', ns_file.name, e)
                         continue
 
-    def list_namespaces(self) -> List[str]:
+    def list_namespaces(self) -> list[str]:
         return list(self.state.keys())
 
     def list_namespace_entities(self, namespace: str) -> list[str]:
@@ -836,21 +836,25 @@ async def set_state(
 
         plugin = self.AD.plugins.get_plugin_object(namespace)
 
-        if set_plugin_state := getattr(plugin, "set_plugin_state", False):
+        plugin_handled = False
+        set_plugin_state: Callable[..., Awaitable[dict[str, Any] | None]] | None
+        if (set_plugin_state := getattr(plugin, "set_plugin_state", None)) is not None:
             # We assume that the state change will come back to us via the plugin
             self.logger.debug("sending event to plugin")
 
-            result = await set_plugin_state( # pyright: ignore[reportCallIssue]
+            result = await set_plugin_state(
                 namespace,
                 entity,
                 state=new_state["state"],
-                attributes=new_state["attributes"]
-            )  # fmt: skip
+                attributes=new_state["attributes"],
+            )
             if result is not None:
                 if "entity_id" in result:
                     result.pop("entity_id")
                 self.state[namespace][entity] = self.parse_state(namespace, entity, **result)
-        else:
+                plugin_handled = True
+
+        if not plugin_handled:
             # Set the state locally
             self.state[namespace][entity] = new_state
             # Fire the event locally