Merge branch 'dev'

Author: acockburn

appdaemon/__main__.py

@@ -227,7 +227,7 @@ def main(self):  # noqa: C901
             "-D",
             "--debug",
             help="global debug level",
-            default="INFO",
+            # default="INFO",
             choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
         )
         parser.add_argument("-m", "--moduledebug", nargs=2, action="append")
@@ -283,7 +283,7 @@ def main(self):  # noqa: C901
             config = {
                 k: v if v is not None else {}
                 for k, v in config.items()
-            } # fmt: skip
+            }  # fmt: skip
 
             ad_kwargs = config["appdaemon"]
 
@@ -299,7 +299,13 @@ def main(self):  # noqa: C901
                 ad_kwargs["endtime"] = args.endtime
 
             ad_kwargs["stop_function"] = self.stop
-            ad_kwargs["loglevel"] = args.debug
+
+            if args.debug is not None:
+                ad_kwargs["loglevel"] = args.debug
+            elif "loglevel" in ad_kwargs:
+                pass
+            else:
+                ad_kwargs["loglevel"] = "INFO"
 
             if args.moduledebug is not None:
                 module_debug_cli = {arg[0]: arg[1] for arg in args.moduledebug}
@@ -319,9 +325,9 @@ def main(self):  # noqa: C901
 
             model = MainConfig.model_validate(config)
 
-            if args.debug.upper() == "DEBUG":
+            if ad_kwargs["loglevel"] == "DEBUG":
                 # need to dump as python types or serializing the timezone object will fail
-                model_json = model.model_dump(mode='python', by_alias=True)
+                model_json = model.model_dump(mode="python", by_alias=True)
                 print(json.dumps(model_json, indent=4, default=str, sort_keys=True))
         except ValidationError as e:
             print(f"Configuration error in: {config_file}")
@@ -335,7 +341,7 @@ def main(self):  # noqa: C901
             print(e)
             sys.exit(1)
 
-        log_cfg = model.model_dump(mode='python', by_alias=True)['logs']
+        log_cfg = model.model_dump(mode="python", by_alias=True)["logs"]
         self.logging = Logging(log_cfg, args.debug)
         self.logger = self.logging.get_logger()
 
@@ -365,7 +371,7 @@ def main(self):  # noqa: C901
         self.logger.debug("AppDaemon Section: %s", config.get("appdaemon"))
         self.logger.debug("HADashboard Section: %s", config.get("hadashboard"))
 
-        dump_kwargs = dict(mode='json', by_alias=True, exclude_unset=True)
+        dump_kwargs = dict(mode="json", by_alias=True, exclude_unset=True)
 
         if (hadashboard := model.hadashboard) is not None:
             hadashboard = hadashboard.model_dump(**dump_kwargs)

appdaemon/events.py

@@ -171,7 +171,7 @@ async def info_event_callback(self, name: str, handle: str):
             else:
                 raise ValueError(f"Invalid handle: {handle}")
 
-    async def fire_event(self, namespace: str, event: str, **kwargs):
+    async def fire_event(self, namespace: str, event: str, **kwargs: Any) -> dict[str, Any] | None:
         """Fires an event.
 
         If the namespace does not have a plugin associated with it, the event will be fired locally.
@@ -190,15 +190,18 @@ async def fire_event(self, namespace: str, event: str, **kwargs):
         """
 
         self.logger.debug("fire_plugin_event() %s %s %s", namespace, event, kwargs)
-        plugin = self.AD.plugins.get_plugin_object(namespace)
-        match plugin:
-            case PluginBase() as plugin:
-                if hasattr(plugin, "fire_plugin_event"):
-                    # We assume that the event will come back to us via the plugin
-                    return await plugin.fire_plugin_event(event, namespace, **kwargs)
-                else:
-                    # Just fire the event locally
-                    await self.AD.events.process_event(namespace, {"event_type": event, "data": kwargs})
+        match self.AD.plugins.get_plugin_object(namespace):
+            case PluginBase() as plugin if hasattr(plugin, "fire_plugin_event"):
+                # In the case that the namespace has a PluginBase associated (both Hass and MQTT plugins do), we check
+                # that the plugin actually has a method called `fire_plugin_event`. If both of these conditions are met,
+                # we call that method to fire the event, and assume that the plugin when the plugin fires the event, it
+                # will make it back to AppDaemon via the normal plugin event processing mechanism.
+                return await plugin.fire_plugin_event(event, namespace, **kwargs)
+            case _:
+                # If anything else comes out of get_plugin_object, we assume that the namespace does not have a plugin
+                # associated with it, and we can fire the event locally.
+                # This is the case for the admin namespace, and any other namespaces that do not have a plugin.
+                return await self.AD.events.process_event(namespace, {"event_type": event, "data": kwargs})
 
     async def process_event(self, namespace: str, data: dict[str, Any]):
         """Processes an event that has been received either locally or from a plugin.

appdaemon/state.py

@@ -538,7 +538,9 @@ async def add_entity(
     ) -> None:
         """Adds an entity to the internal state registry and fires the ``__AD_ENTITY_ADDED`` event"""
         if self.entity_exists(namespace, entity):
-            self.logger.warning("%s already exists, will not be adding it", entity)
+            # No warning is necessary because this method gets called twice for the app entities because of
+            # create_initial_threads and then again during start_app
+            # self.logger.warning("%s already exists, will not be adding it", entity)
             return
 
         state = {

appdaemon/version.py

@@ -1,2 +1,2 @@
-__version__ = "4.5.9"
+__version__ = "4.5.10"
 __version_comments__ = ""

docs/CONFIGURE.rst

@@ -272,6 +272,11 @@ The following settings provide a high level of control over AppDaemon's internal
       Setting this to a specific value will turn off automatic thread management.
     -
 
+  * - loglevel
+    - The global log level for AppDaemon's main log. This can be set to ``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``.
+      The default is ``INFO``. Note that this value will be overridden by the `-D` command line flag, if it is set.
+    - ``INFO``
+
   * - pin_apps
     - If ``true``, AppDaemon apps will be pinned to a particular thread.
       This should avoids complications around re-entrant code and locking of instance variables.

docs/HISTORY.md

@@ -1,10 +1,10 @@
 # Change Log
 
-## 4.5.9
+## 4.5.10
 
 **Features**
 
-None
+- Added "log_level" directive to `appdaemon'yaml` to allow global log level setting
 
 **Fixes**
 
@@ -54,23 +54,6 @@ None
 **Fixes**
 
 - Fixed issue with getter that prevented app initialization
-
-**Breaking Changes**
-
-None
-
-**Changes in Behavior**
-
-None
-
-## 4.5.6 (2025-06-01)
-
-**Features**
-
-None
-
-**Fixes**
-
 - Fixed an async issue with `firendly_name()`
 - Added missing setter for global_vars