Merge branch 'dev' into ha-ssl

Author: acockburn

.github/workflows/python-tests.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v5
     - name: Install uv and set the python version
       id: setup-uv
-      uses: astral-sh/setup-uv@v6
+      uses: astral-sh/setup-uv@v7
       with:
         version: "0.8.15" # It is considered best practice to pin to a specific uv version
         # https://github.com/astral-sh/setup-uv?tab=readme-ov-file#enable-caching
@@ -50,7 +50,7 @@ jobs:
     - uses: actions/checkout@v5
     - name: Install uv and set the python version
       id: setup-uv
-      uses: astral-sh/setup-uv@v6
+      uses: astral-sh/setup-uv@v7
       with:
         # https://docs.astral.sh/uv/guides/integration/github/#multiple-python-versions
         python-version: ${{ matrix.python-version }}

.gitignore

@@ -46,6 +46,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+tests/conf/namespaces
 
 # Translations
 *.mo

appdaemon/adapi.py

@@ -765,9 +765,9 @@ def _check_entity(self, namespace: str, entity_id: str | None) -> None:
         """Ensures that the entity exists in the given namespace"""
         if entity_id is not None and "." in entity_id and not self.AD.state.entity_exists(namespace, entity_id):
             if namespace == "default":
-                self.logger.warning(f"Entity {entity_id} not found in the default namespace")
+                self.logger.warning("Entity %s not found in the default namespace", entity_id)
             else:
-                self.logger.warning(f"Entity {entity_id} not found in namespace {namespace}")
+                self.logger.warning("Entity %s not found in namespace %s", entity_id, namespace)
 
     @staticmethod
     def get_ad_version() -> str:
@@ -817,7 +817,7 @@ async def add_entity(
             >>> self.add_entity('mqtt.living_room_temperature', namespace='mqtt')
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         return await self.AD.state.add_entity(namespace, entity_id, state, attributes)
 
     @utils.sync_decorator
@@ -850,7 +850,7 @@ async def entity_exists(self, entity_id: str, namespace: str | None = None) -> b
             >>> if self.entity_exists("mqtt.security_settings", namespace = "mqtt"):
             >>>    #do something
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         return self.AD.state.entity_exists(namespace, entity_id)
 
     @utils.sync_decorator
@@ -877,7 +877,7 @@ async def split_entity(self, entity_id: str, namespace: str | None = None) -> li
             >>>     #do something specific to scenes
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         self._check_entity(namespace, entity_id)
         return entity_id.split(".")
 
@@ -907,7 +907,7 @@ async def remove_entity(self, entity_id: str, namespace: str | None = None) -> N
             >>> self.remove_entity('mqtt.living_room_temperature', namespace = 'mqtt')
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         await self.AD.state.remove_entity(namespace, entity_id)
 
     @staticmethod
@@ -952,7 +952,7 @@ async def get_plugin_config(self, namespace: str | None = None) -> Any:
             My current position is 50.8333(Lat), 4.3333(Long)
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         return self.AD.plugins.get_plugin_meta(namespace)
 
     @utils.sync_decorator
@@ -976,7 +976,7 @@ async def friendly_name(self, entity_id: str, namespace: str | None = None) -> s
             device_tracker.andrew (Andrew Tracker) is on.
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         self._check_entity(namespace, entity_id)
         return await self.get_state(
             entity_id=entity_id,
@@ -1584,7 +1584,7 @@ async def listen_state(
         """
         kwargs = dict(new=new, old=old, duration=duration, attribute=attribute, **kwargs)
         kwargs = {k: v for k, v in kwargs.items() if v is not None}
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
 
         # pre-fill some arguments here
         add_callback = functools.partial(
@@ -1724,9 +1724,10 @@ async def get_state(
         if kwargs:
             self.logger.warning(f"Extra kwargs passed to get_state, will be ignored: {kwargs}")
 
+        namespace = namespace if namespace is not None else self.namespace
         return await self.AD.state.get_state(
             name=self.name,
-            namespace=namespace or self.namespace,
+            namespace=namespace,
             entity_id=entity_id,
             attribute=attribute,
             default=default,
@@ -1783,7 +1784,7 @@ async def set_state(
             >>> self.set_state("light.office_1", state="off", namespace="hass")
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         if check_existence:
             self._check_entity(namespace, entity_id)
         return await self.AD.state.set_state(
@@ -1846,7 +1847,7 @@ def register_service(self, service: str, cb: Callable, namespace: str | None = N
         self._check_service(service)
         self.logger.debug("register_service: %s, %s", service, kwargs)
 
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         try:
             domain, service = service.split("/", 2)
         except ValueError as e:
@@ -1886,7 +1887,7 @@ def deregister_service(self, service: str, namespace: str | None = None) -> bool
             >>> self.deregister_service("myservices/service1")
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         self.logger.debug("deregister_service: %s, %s", service, namespace)
         self._check_service(service)
         return self.AD.services.deregister_service(namespace, *service.split("/"), name=self.name)
@@ -1996,7 +1997,7 @@ async def call_service(
         """
         self.logger.debug("call_service: %s, %s", service, data)
         self._check_service(service)
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
 
         # Check the entity_id if it exists
         if eid := data.get("entity_id"):
@@ -2054,7 +2055,7 @@ async def run_sequence(self, sequence: str | list[dict[str, dict[str, str]]], na
                 ])
 
         """
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         self.logger.debug("Calling run_sequence() for %s from %s", sequence, self.name)
 
         try:
@@ -2197,11 +2198,12 @@ async def listen_event(
         """
         self.logger.debug(f"Calling listen_event() for {self.name} for {event}: {kwargs}")
 
+        namespace = namespace if namespace is not None else self.namespace
         # pre-fill some arguments here
         add_callback = functools.partial(
             self.AD.events.add_event_callback,
             name=self.name,
-            namespace=namespace or self.namespace,
+            namespace=namespace,
             cb=callback,
             timeout=timeout,
             oneshot=oneshot,
@@ -2311,7 +2313,7 @@ async def fire_event(
             # Convert to float if it's not None
             timeout = utils.parse_timedelta(timeout).total_seconds() if timeout is not None else timeout
             kwargs["timeout"] = timeout
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         await self.AD.events.fire_event(namespace, event, **kwargs)
 
     #
@@ -3743,7 +3745,7 @@ async def sleep(delay: float, result: T = None) -> T:
     #
 
     def get_entity(self, entity: str, namespace: str | None = None, check_existence: bool = True) -> Entity:
-        namespace = namespace or self.namespace
+        namespace = namespace if namespace is not None else self.namespace
         if check_existence:
             self._check_entity(namespace, entity)
         return Entity(self, namespace, entity)

appdaemon/appdaemon.py

@@ -119,6 +119,7 @@ def __init__(
         self.booted = "booting"
         self.logger = logging.get_logger()
         self.logging.register_ad(self)  # needs to go last to reference the config object
+        self._shutdown_logger = self.logging.get_child("_shutdown")
         self.stop_event = asyncio.Event()
 
         self.global_vars: Any = {}
@@ -390,22 +391,22 @@ async def stop(self) -> None:
         - :meth:`Scheduler <appdaemon.scheduler.Scheduler.stop>`
         - :meth:`State <appdaemon.state.State.stop>`
         """
-        self.logger.info("Stopping AppDaemon")
+        self._shutdown_logger.info("Stopping AppDaemon")
         self.stopping = True
 
         # Subsystems are able to create tasks during their stop methods
         if self.apps_enabled:
             try:
                 await asyncio.wait_for(self.app_management.stop(), timeout=3)
             except asyncio.TimeoutError:
-                self.logger.warning("AppManagement stop timed out, continuing shutdown")
+                self._shutdown_logger.warning("AppManagement stop timed out, continuing shutdown")
         if self.thread_async is not None:
             self.thread_async.stop()
         if self.plugins is not None:
             try:
                 await asyncio.wait_for(self.plugins.stop(), timeout=1)
             except asyncio.TimeoutError:
-                self.logger.warning("Timed out stopping plugins, continuing shutdown")
+                self._shutdown_logger.warning("Timed out stopping plugins, continuing shutdown")
         self.sched.stop()
         self.state.stop()
         self.threading.stop()
@@ -420,7 +421,20 @@ async def stop(self) -> None:
             all_coro = asyncio.wait(running_tasks, return_when=asyncio.ALL_COMPLETED, timeout=3)
             gather_task = asyncio.create_task(all_coro, name="appdaemon_stop_tasks")
             gather_task.add_done_callback(lambda _: self.logger.debug("All tasks finished"))
-            self.logger.debug("Waiting for tasks to finish...")
+            self._shutdown_logger.debug("Waiting for tasks %s to finish...", len(running_tasks))
+
+            # These is left here for future debugging purposes
+            # await asyncio.sleep(2.0)
+            # still_running = [
+            #     task
+            #     for task in asyncio.all_tasks()
+            #     if task is not current_task and task is not gather_task and not task.done()
+            # ]
+            # self._shutdown_logger.debug("%s tasks still running after 2 seconds", len(still_running))
+            # if still_running:
+            #     for task in still_running:
+            #         self._shutdown_logger.debug("Still running: %s", task.get_name())
+
             await gather_task
 
     #

appdaemon/models/config/plugin.py

@@ -85,7 +85,7 @@ class StartupConditions(BaseModel):
     event: EventStartupCondition | None = None
 
 
-class HASSConfig(PluginConfig):
+class HASSConfig(PluginConfig, extra="forbid"):
     ha_url: str = "http://supervisor/core"
     token: SecretStr
     ha_key: Annotated[SecretStr, deprecated("'ha_key' is deprecated. Please use long lived tokens instead")] | None = None
@@ -101,6 +101,7 @@ class HASSConfig(PluginConfig):
     commtype: Annotated[str, deprecated("'commtype' is deprecated")] | None = None
     ws_timeout: ParsedTimedelta = timedelta(seconds=10)
     """Default timeout for waiting for responses from the websocket connection"""
+    ws_max_msg_size: int = 4 * 1024 * 1024
     suppress_log_messages: bool = False
     services_sleep_time: ParsedTimedelta = timedelta(seconds=60)
     """The sleep time in the background task that updates the internal list of available services every once in a while"""

appdaemon/plugins/hass/exceptions.py

@@ -41,3 +41,10 @@ def __str__(self):
         if self.namespace != "default":
             res += f" with namespace '{self.namespace}'"
         return res
+
+@dataclass
+class HassConnectionError(ade.AppDaemonException):
+    msg: str
+
+    def __str__(self) -> str:
+        return self.msg