appdaemon 4.5.0__tar.gz → 4.5.2__tar.gz

appdaemon-4.5.2/PKG-INFO

@@ -0,0 +1,80 @@
+Metadata-Version: 2.4
+Name: appdaemon
+Version: 4.5.2
+Summary: Apps for the Home Assistant home automation package.
+Author-email: Andrew I Cockburn <appdaemon@acockburn.com>
+Project-URL: documentation, https://appdaemon.readthedocs.io
+Project-URL: repository, https://github.com/AppDaemon
+Project-URL: changelog, https://github.com/AppDaemon/appdaemon/blob/master/docs/HISTORY.rst
+Keywords: appdaemon,home,automation
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Home Automation
+Requires-Python: <3.13,>=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: aiohttp<3.12.0,>=3.9.0
+Requires-Dist: aiohttp_jinja2<1.7.0,>=1.5.1
+Requires-Dist: astral~=3.2
+Requires-Dist: bcrypt<4.3.0,>=4.0.1
+Requires-Dist: deepdiff==8.2.0
+Requires-Dist: feedparser~=6.0.10
+Requires-Dist: iso8601<2.2,>=1.1
+Requires-Dist: paho-mqtt<2.2.0,>=1.6.1
+Requires-Dist: pid~=3.0.4
+Requires-Dist: python-dateutil<2.10.0,>=2.8.2
+Requires-Dist: python-socketio<5.12,>=5.5
+Requires-Dist: pytz<2025.2.0,>=2022.7.1
+Requires-Dist: pyyaml~=6.0.1
+Requires-Dist: requests<2.33.0,>=2.28.2
+Requires-Dist: sockjs<0.14,>=0.11
+Requires-Dist: uvloop==0.21.0; sys_platform != "win32"
+Requires-Dist: tomli==2.2.1
+Requires-Dist: tomli_w<1.3,>=1.0
+Requires-Dist: pydantic~=2.10.6
+Provides-Extra: dev
+Requires-Dist: pip-tools<7.5.0,>=6.12.3; extra == "dev"
+Requires-Dist: build<1.3,>=0.10; extra == "dev"
+Requires-Dist: flake8~=7.1.1; extra == "dev"
+Requires-Dist: black<25.2,>=23.1; extra == "dev"
+Requires-Dist: pre-commit<3.9.0,>=3.1.1; python_version > "3.7" and extra == "dev"
+Requires-Dist: pytest<8.4.0,>=7.2.1; extra == "dev"
+Requires-Dist: ruff<0.7.0,>=0.0.261; extra == "dev"
+Requires-Dist: codespell>=2.4.1; extra == "dev"
+Provides-Extra: doc
+Requires-Dist: sphinx-autobuild<2024.10.0,>=2021.3.14; extra == "doc"
+Requires-Dist: sphinx-rtd-theme==3.0.2; extra == "doc"
+Requires-Dist: pygments<2.20,>=2.14; extra == "doc"
+Requires-Dist: myst-parser==4.0.0; extra == "doc"
+Dynamic: license-file
+
+# Description
+
+AppDaemon is a loosely coupled, multi-threaded, sandboxed python
+execution environment for writing automation apps for various types of Home Automation Software including [Home
+Assistant](https://home-assistant.io/) and MQTT. It has a pluggable architecture allowing it to be integrated with
+practically any event driven application.
+
+It also provides a configurable dashboard (HADashboard)
+suitable for wall mounted tablets.
+
+## Getting started
+
+For full instructions on installation and usage check out the [AppDaemon Project Documentation](http://appdaemon.readthedocs.io).
+
+## Release Cycle Frequency
+
+AppDaemon has reached a very stable point, works reliably and is fairly feature rich at this point
+in its development. For that reason, releases have been slow in recent months. This does not mean that AppDaemon has been abandoned -
+ it is used every day by the core developers and has an active discord server [here](https://discord.gg/sgSr79jW5x) - please join us for tips
+and tricks, AppDaemon discussions and general home automation.
+
+## Contributing
+
+This is an active open-source project. We are always open to people who want to use the code or contribute to it. Thank you for being involved!
+Have a look at the [official documentation](https://appdaemon.readthedocs.io/en/latest/DEV.html) for more information.

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/adapi.py

@@ -255,8 +255,11 @@ class ADAPI:
         # Its a user defined log
         logger = self.logger if log is None else self.get_user_log(log)
 
+        if ascii_encode is None:
+            ascii_encode = self.AD.config.ascii_encode
+
         kwargs = dict(
-            ascii_encode=ascii_encode or self.AD.config.ascii_encode,
+            ascii_encode=ascii_encode,
             stack_info=stack_info,
             stacklevel=stacklevel,
             extra=extra,
@@ -1678,7 +1681,7 @@ class ADAPI:
                 `namespace documentation <APPGUIDE.html#namespaces>`__ for more information.
             copy (bool, optional): Whether to return a copy of the internal data. This is ``True`` by default in order
                 to protect the user from accidentally modifying AppDaemon's internal data structures, which is dangerous
-                and can cause undefined behvaior. Only set this to ``False`` for read-only operations.
+                and can cause undefined behavior. Only set this to ``False`` for read-only operations.
 
         Returns:
             The state or attribute of the entity ID provided or a dict of that maps entity IDs to their respective
@@ -1809,7 +1812,7 @@ class ADAPI:
         accept arbitrary keyword arguments.
 
         Registering services in namespaces that already have plugins is not recommended, as it can lead to some
-        unpredictable behavior. Intead, it's recommended to use a user-defined namespace or one that is not tied to
+        unpredictable behavior. Instead, it's recommended to use a user-defined namespace or one that is not tied to
         plugin.
 
         Args:
@@ -3639,7 +3642,8 @@ class ADAPI:
         self.AD.futures.add_future(self.name, future)
         return future
 
-    def create_task(
+    @utils.sync_decorator
+    async def create_task(
         self,
         coro: Coroutine[Any, Any, T],
         callback: Callable | None = None,

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/adbase.py

@@ -5,8 +5,9 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 from appdaemon import adapi
+from appdaemon import utils
 from appdaemon.models.config.app import AppConfig
-from appdaemon.utils import StateAttrs
+
 
 # Check if the module is being imported using the legacy method
 if __name__ == Path(__file__).name:
@@ -31,7 +32,7 @@ class Entities:  # @todo
         pass
 
     def __get__(self, instance, owner):
-        stateattrs = StateAttrs(instance.get_state())
+        stateattrs = utils.StateAttrs(instance.get_state())
         return stateattrs
 
 
@@ -165,7 +166,8 @@ class ADBase:
     def get_ad_api(self) -> adapi.ADAPI:
         return adapi.ADAPI(self.AD, self.config_model)
 
-    def get_plugin_api(self, plugin_name: str):
+    @utils.sync_decorator
+    async def get_plugin_api(self, plugin_name: str):
         """Get the plugin API for a specific plugin."""
         if isinstance(cfg := self.app_config.root.get(self.name), AppConfig):
             return self.AD.plugins.get_plugin_api(plugin_name, cfg)

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/app_management.py

@@ -569,7 +569,7 @@ class AppManagement:
                 yield new_cfg
 
         def update(d1: dict, d2: dict) -> dict:
-            """Internal funciton to log warnings if an app's name gets repeated."""
+            """Internal function to log warnings if an app's name gets repeated."""
             if overlap := set(k.lower() for k in d2 if k in d1):
                 # There's a special case for the sequences in order to merge them if they're defined in multiple files
                 if "sequence" in overlap:
@@ -615,7 +615,7 @@ class AppManagement:
                     self._compare_sequences(update_actions, cfg, files_to_read)
                     continue
 
-                if name in self.non_apps:
+                if name in self.non_apps or cfg.disable:
                     continue
 
                 # New config found
@@ -685,8 +685,14 @@ class AppManagement:
                 if not module_name.startswith("appdaemon"):
                     self.logger.debug("Importing '%s'", module_name)
                     importlib.import_module(module_name)
-        except SyntaxError as exc:
-            path = Path(exc.filename)
+        except Exception as exc:
+            match exc:
+                case SyntaxError():
+                    path = Path(exc.filename)
+                case NameError():
+                    path = Path(traceback.extract_tb(exc.__traceback__)[-1].filename)
+                case _:
+                    raise exc
             mtime = self.dependency_manager.python_deps.files.mtimes.get(path)
             self.dependency_manager.python_deps.bad_files.add((path, mtime))
             raise exc
@@ -846,7 +852,7 @@ class AppManagement:
                 for path in import_dirs:
                     self.add_to_import_path(path)
 
-                # Add any aditional import paths
+                # Add any additional import paths
                 for path in map(Path, self.AD.import_paths):
                     if not path.exists():
                         self.logger.warning(
@@ -989,13 +995,16 @@ class AppManagement:
             update_actions.apps.reload -= failed_to_stop
 
     async def _start_apps(self, update_actions: UpdateActions):
+        if failed := update_actions.apps.failed:
+            self.logger.warning('Failed to start apps: %s', failed)
+
         start_order = update_actions.apps.start_sort(self.dependency_manager)
         if start_order:
             self.logger.info("Starting apps: %s", update_actions.apps.init_set)
             self.logger.debug("App start order: %s", start_order)
 
             for app_name in start_order:
-                if isinstance((cfg := self.app_config.root[app_name]), AppConfig):
+                if isinstance((cfg := self.app_config.root[app_name]), AppConfig) and not cfg.disable:
                     @ade.wrap_async(self.error, self.AD.app_dir, f"'{app_name}' instantiation")
                     async def safe_create(self: "AppManagement"):
                         try:

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/assets/css/default/variables.yaml

@@ -1,6 +1,6 @@
 # Core styles. Reference these wherever possible rather than making custom
 # versions of red, green, etc. This will make it easier to quickly change the
-# overall pallette of the dashboard just by overriding these variables.
+# overall palette of the dashboard just by overriding these variables.
 
 # This file contains the application "defaults".
 # IF YOU WANT TO CUSTOMIZE styleS FOR YOUR OWN INSTANCE, DO NOT EDIT THIS FILE.

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/assets/css/glassic/variables.yaml

@@ -1,6 +1,6 @@
 # Core styles. Reference these wherever possible rather than making custom
 # versions of red, green, etc. This will make it easier to quickly change the
-# overall pallette of the dashboard just by overriding these variables.
+# overall palette of the dashboard just by overriding these variables.
 
 # This file contains the application "defaults".
 # IF YOU WANT TO CUSTOMIZE styleS FOR YOUR OWN INSTANCE, DO NOT EDIT THIS FILE.

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/assets/css/obsidian/variables.yaml

@@ -22,7 +22,7 @@
 # gray and getting progressively darker towards night.  Be aware that if you remove
 # it, you will end up with a white background so plan accordingly if this is a problem.
 #
-# The meta tag jsut above this refreshes your dash once an hour so you can see the
+# The meta tag just above this refreshes your dash once an hour so you can see the
 # effect of the script without manually reloading the dashboard.  The content value
 # is in seconds so if you want it shorter or longer you can adjust that value
 #

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/assets/css/simplyred/variables.yaml

@@ -22,7 +22,7 @@
 # gray and getting progressively darker towards night.  Be aware that if you remove
 # it, you will end up with a white background so plan accordingly if this is a problem.
 #
-# The meta tag jsut above this refreshes your dash once an hour so you can see the
+# The meta tag just above this refreshes your dash once an hour so you can see the
 # effect of the script without manually reloading the dashboard.  The content value
 # is in seconds so if you want it shorter or longer you can adjust that value
 #

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/dependency.py

@@ -92,6 +92,7 @@ def get_file_deps(file_path: str | Path) -> set[str]:
             mod: ast.Module = ast.parse(file_content, filename=file_path)
         except Exception as e:
             logger.warning(f"Error parsing python module with AST: {e}")
+            raise e
         else:
             for node in get_imports(mod):
                 match node:
@@ -107,18 +108,32 @@ def get_file_deps(file_path: str | Path) -> set[str]:
     return set(gen_modules())
 
 
-def get_dependency_graph(files: Iterable[Path], exclude: set[Path] | None = None):
-    graph = {
-        get_full_module_name(f): get_file_deps(f)
-        for f in files
-        if exclude is None or f not in exclude
-    }
+def get_dependency_graph(
+    files: Iterable[Path],
+    exclude: set[Path] | None = None
+) -> tuple[dict[str, set[str]], set[Path]]:
+    """Gets the dependency graph for some Python files.
+
+    Returns:
+        A tuple containing:
+        - A dictionary where keys are module names and values are sets of module names that the key module depends on.
+        - A set of paths that failed to parse or resolve dependencies.
+    """
+    graph = {}
+    failed = set()
+    for f in files:
+        if exclude is None or f not in exclude:
+            try:
+                graph[get_full_module_name(f)] = get_file_deps(f)
+            except Exception:
+                failed.add(f)
+                continue
 
     for mod, deps in graph.items():
         if mod in deps:
             deps.remove(mod)
 
-    return graph
+    return graph, failed
 
 
 def get_all_nodes(deps: dict[str, set[str]]) -> set[str]:

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/dependency_manager.py

@@ -1,4 +1,5 @@
 from abc import ABC
+from copy import deepcopy
 from dataclasses import InitVar, dataclass, field
 from pathlib import Path
 from typing import Iterable
@@ -16,14 +17,14 @@ class Dependencies(ABC):
     ext: str = field(init=False)  # this has to be defined by the children classes
     dep_graph: dict[str, set[str]] = field(init=False)
     rev_graph: dict[str, set[str]] = field(init=False)
-    bad_files: set[Path] = field(default_factory=set, init=False)
+    bad_files: set[tuple[Path, float]] = field(default_factory=set, init=False)
 
     def __post_init__(self):
         self.refresh_dep_graph()
 
     def update(self, new_files: Iterable[Path]):
         self.files.update(new_files)
-        for bf, mtime in self.bad_files:
+        for bf, mtime in deepcopy(self.bad_files):
             new_mtime = self.files.mtimes.get(bf)
             if new_mtime != mtime:
                 assert new_mtime > mtime, f"File {bf} was modified in the future"
@@ -65,7 +66,12 @@ class PythonDeps(Dependencies):
         if self.bad_files:
             bad_files, _ = zip(*self.bad_files)
             bad_files = set(bad_files)
-        self.dep_graph = get_dependency_graph(self.files, exclude=bad_files)
+
+        self.dep_graph, failed = get_dependency_graph(self.files, exclude=bad_files)
+
+        for file in failed:
+            self.bad_files.add((file, self.files.mtimes.get(file, 0)))
+
         self.rev_graph = reverse_graph(self.dep_graph)
 
     def modules_to_import(self) -> set[str]:

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/entity.py

@@ -151,7 +151,7 @@ class Entity:
             default (any, optional): The value to return when the entity or the attribute doesn't exist.
             copy (bool, optional): Whether to return a copy of the internal data. This is ``True`` by default in order
                 to protect the user from accidentally modifying AppDaemon's internal data structures, which is dangerous
-                and can cause undefined behvaior. Only set this to ``False`` for read-only operations.
+                and can cause undefined behavior. Only set this to ``False`` for read-only operations.
 
         Returns:
             The entire state of the entity at that given time, if  if ``get_state()``
@@ -550,7 +550,6 @@ class Entity:
 
     @property
     def _simple_state(self) -> dict[str, Any]:
-        return self.adapi.get_state()
         return self.AD.state.get_state_simple(self.namespace, self.entity_id)
 
     @property
@@ -603,7 +602,7 @@ class Entity:
     def last_changed_delta(self) -> timedelta | None:
         """A timedelta object representing the time since the entity was last changed"""
         if time_str := self.last_changed:
-            compare = self.adapi.parse_time(time_str, aware=True)
+            compare = self.adapi.parse_datetime(time_str, aware=True)
             now = self.AD.sched.get_now_sync()
             return (now - compare)
 

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/exceptions.py

@@ -54,9 +54,10 @@ def user_exception_block(logger: Logger, exception: AppDaemonException, app_dir:
     """Function to generate a user-friendly block of text for an exception. Gets the whole chain of exception causes to decide what to do.
     """
     width = 75
+    spacing = 4
     inset = 5
     if header is not None:
-        header = f'{"=" * inset}  {header}  {"=" * (width - inset - len(header))}'
+        header = f'{"=" * inset}  {header}  {"=" * (width - spacing - inset - len(header))}'
     else:
         header = '=' * width
     logger.error(header)
@@ -86,10 +87,12 @@ def user_exception_block(logger: Logger, exception: AppDaemonException, app_dir:
                         logger.error(f'{indent}{filename} line {line} in {func_name}')
             case OSError() if str(exc).endswith('address already in use'):
                 logger.error(f'{indent}{exc.__class__.__name__}: {exc}')
-            case NameError():
+            case NameError() | ImportError():
                 logger.error(f'{indent}{exc.__class__.__name__}: {exc}')
                 if tb := traceback.extract_tb(exc.__traceback__):
                     frame = tb[-1]
+                    file = Path(frame.filename).relative_to(app_dir.parent)
+                    logger.error(f'{indent}  line {frame.lineno} in {file.name}')
                     logger.error(f'{indent}  {frame._line.rstrip()}')
                     error_len = frame.end_colno - frame.colno
                     logger.error(f'{indent}  {" " * (frame.colno - 1)}{"^" * error_len}')
@@ -112,7 +115,7 @@ def user_exception_block(logger: Logger, exception: AppDaemonException, app_dir:
                     for line in lines:
                         logger.error(f'{indent}{line}')
 
-    logger.error('=' * 75)
+    logger.error('=' * width)
 
 
 def unexpected_block(logger: Logger, exception: Exception):
@@ -318,7 +321,7 @@ class HTTPHostError(AppDaemonException):
 
     def __str__(self):
         res = "Invalid host specified in URL for HTTP component\n"
-        res += "As of AppDaemon 4.5 the host name specificed in the URL must resolve to a known host\n"
+        res += "As of AppDaemon 4.5 the host name specified in the URL must resolve to a known host\n"
         res += "You can restore previous behavior by using `0.0.0.0` as the host portion of the URL\n"
         res += f"For instance: `http://0.0.0.0:{self.port}`\n"
         return res

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/http.py

@@ -96,9 +96,7 @@ def route_secure(myfunc):
             return await myfunc(*args)
 
         elif "adcreds" in request.cookies:
-            match = await utils.run_in_executor(
-                self, bcrypt.checkpw, str.encode(self.password), str.encode(request.cookies["adcreds"])
-            )
+            match = await utils.run_in_executor(self, bcrypt.checkpw, str.encode(self.password), str.encode(request.cookies["adcreds"]))
             if match:
                 return await myfunc(*args)
 
@@ -117,13 +115,14 @@ class HTTP:
     AD: "AppDaemon"
     """Reference to the AppDaemon container object
     """
+    name: str = "_http"
 
     stopping: bool
     executor: concurrent.futures.ThreadPoolExecutor
 
     def __init__(self, ad: "AppDaemon", dashboard, old_admin, admin, api, http):
         self.AD = ad
-        self.logger = self.logging.get_child("_http")
+        self.logger = self.logging.get_child(self.name)
         self.access = self.logging.get_access()
 
         self.dashboard = dashboard
@@ -175,12 +174,19 @@ class HTTP:
 
         try:
             url = urlparse(self.url)
-
             self.host = url.hostname
-            try:
+            self.scheme = url.scheme
+
+            if url.port is None:
+                match url.scheme:
+                    case "http":
+                        self.port = 80
+                    case "https":
+                        self.port = 443
+                    case _:
+                        self.port = None  # let the validation catch it
+            else:
                 self.port = url.port
-            except IndexError:
-                self.port = 80
 
             if self.host == "":
                 raise ValueError("Invalid host for 'url'")
@@ -372,9 +378,7 @@ class HTTP:
 
         self._process_arg("url", http)
         if not self.url:
-            self.logger.warning(
-                "'{arg}' is '{value}'. Please configure appdaemon.yaml".format(arg="url", value=self.url)
-            )
+            self.logger.warning("'{arg}' is '{value}'. Please configure appdaemon.yaml".format(arg="url", value=self.url))
             exit(0)
 
         self._process_arg("transport", http)
@@ -893,7 +897,7 @@ class HTTP:
             return self.get_response(request, code, "App Not Found")
 
         elif code == 500:
-            return self.get_response(request, code, "An Error occured while processing request")
+            return self.get_response(request, code, "An Error occurred while processing request")
 
         response = "OK"
         self.access.info("API Call to %s: status: %s %s", endpoint, code, response)

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/models/internal/app_management.py

@@ -71,7 +71,7 @@ class LoadingActions:
         Uses a dependency graph to sort the internal ``init`` and ``reload`` sets together
         """
         items = copy(self.init_set)
-        items |= find_all_dependents(items, dm.app_deps.rev_graph)
+        items |= find_all_dependents(items, dm.app_deps.dep_graph)
         priorities = {
             app_name: dm.app_deps.app_config.root[app_name].priority
             for app_name in items

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/plugins/hass/hassapi.py

@@ -384,7 +384,7 @@ class Hass(ADBase, ADAPI):
             case Iterable():
                 constraints = value if isinstance(value, list) else list(value)
 
-        assert isinstance(value, list) and all(isinstance(v, str) for v in value)
+        assert isinstance(constraints, list) and all(isinstance(v, str) for v in constraints)
 
         for constraint in constraints:
             parts = re.split(r',\s*', constraint)
@@ -475,7 +475,7 @@ class Hass(ADBase, ADAPI):
                 ``timeout``. If ``timeout`` is shorter than this one, it will trigger before this one does.
             suppress_log_messages (bool, optional): Only applicable to the Hass plugin. If this is set to ``True``,
                 Appdaemon will suppress logging of warnings for service calls to Home Assistant, specifically timeouts
-                and non OK statuses. Use this flag and set it to ``True`` to supress these log messages if you are
+                and non OK statuses. Use this flag and set it to ``True`` to suppress these log messages if you are
                 performing your own error checking as described `here <APPGUIDE.html#some-notes-on-service-calls>`__
             service_data (dict, optional): Used as an additional dictionary to pass arguments into the ``service_data``
                 field of the JSON that goes to Home Assistant. This is useful if you have a dictionary that you want to

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/plugins/hass/hassplugin.py

@@ -1,5 +1,5 @@
 """
-Interface with Home Assistant, send and recieve evets, state etc.
+Interface with Home Assistant, send and receive evets, state etc.
 """
 
 import asyncio
@@ -661,7 +661,7 @@ class HassPlugin(PluginBase):
                 shorter than this one, it will trigger before this one does.
             suppress_log_messages (bool, optional): If this is set to ``True``, Appdaemon will suppress logging of
                 warnings for service calls to Home Assistant, specifically timeouts and non OK statuses. Use this flag
-                and set it to ``True`` to supress these log messages if you are performing your own error checking as
+                and set it to ``True`` to suppress these log messages if you are performing your own error checking as
                 described `here <APPGUIDE.html#some-notes-on-service-calls>`__
             service_data (dict, optional): Used as an additional dictionary to pass arguments into the ``service_data``
                 field of the JSON that goes to Home Assistant. This is useful if you have a dictionary that you want to

{appdaemon-4.5.0 → appdaemon-4.5.2}/appdaemon/plugins/mqtt/mqttapi.py

@@ -120,7 +120,7 @@ class Mqtt(adbase.ADBase, adapi.ADAPI):
 
             binary (bool, optional): If wanting the payload to be returned as binary, this should
                 be specified. If not given, AD will return the payload as decoded data. It should
-                be noted that it is not possible to have different apps receieve both binary and non-binary
+                be noted that it is not possible to have different apps receive both binary and non-binary
                 data on the same topic
 
         Returns:
@@ -229,23 +229,17 @@ class Mqtt(adbase.ADBase, adapi.ADAPI):
         result = self.call_service(service, **kwargs)
         return result
 
-    def _run_service_call(self, task: str, topic: Union[str, list], **kwargs: Optional[Any]) -> None:
+    def _run_service_call(self, task: str, topic: str | list[str], **kwargs: Optional[Any]) -> None:
         """Used to process the subscribe/unsubscribe service calls"""
 
         # first we validate the topic
         if not isinstance(topic, (str, list)):
             raise ValueError(f"The given topic {topic} is not supported. Please only strs and lists are supported")
 
-        if isinstance(topic, str):
-            kwargs["topic"] = topic
-            service = f"mqtt/{task}"
-            self.call_service(service, **kwargs)
+        kwargs["topic"] = topic
+        service = f"mqtt/{task}"
+        return self.call_service(service, **kwargs)
 
-        else:  # its a list
-            for t in topic:
-                kwargs["topic"] = t
-                service = f"mqtt/{task}"
-                self.call_service(service, **kwargs)
 
     def mqtt_subscribe(self, topic: Union[str, list], **kwargs: Optional[Any]) -> None:
         """Subscribes to a MQTT topic.
@@ -284,7 +278,7 @@ class Mqtt(adbase.ADBase, adapi.ADAPI):
 
         """
 
-        self._run_service_call("subscribe", topic, **kwargs)
+        return self._run_service_call("subscribe", topic, **kwargs)
 
     def mqtt_unsubscribe(self, topic: Union[str, list], **kwargs: Optional[Any]) -> None:
         """Unsubscribes from a MQTT topic.
@@ -323,7 +317,7 @@ class Mqtt(adbase.ADBase, adapi.ADAPI):
 
         """
 
-        self._run_service_call("unsubscribe", topic, **kwargs)
+        return self._run_service_call("unsubscribe", topic, **kwargs)
 
     @utils.sync_decorator
     async def is_client_connected(self, **kwargs: Optional[Any]) -> bool: