appdaemon 4.5.2__tar.gz → 4.5.3__tar.gz

{appdaemon-4.5.2/appdaemon.egg-info → appdaemon-4.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appdaemon
-Version: 4.5.2
+Version: 4.5.3
 Summary: Apps for the Home Assistant home automation package.
 Author-email: Andrew I Cockburn <appdaemon@acockburn.com>
 Project-URL: documentation, https://appdaemon.readthedocs.io

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

@@ -489,7 +489,8 @@ class ADAPI:
     # Threading
     #
 
-    def set_app_pin(self, pin: bool) -> None:
+    @utils.sync_decorator
+    async def set_app_pin(self, pin: bool) -> None:
         """Sets an App to be pinned or unpinned.
 
         Args:
@@ -506,7 +507,8 @@ class ADAPI:
         """
         self.AD.app_management.set_app_pin(self.name, pin)
 
-    def get_app_pin(self) -> bool:
+    @utils.sync_decorator
+    async def get_app_pin(self) -> bool:
         """Finds out if the current App is currently pinned or not.
 
         Returns:
@@ -519,7 +521,8 @@ class ADAPI:
         """
         return self.AD.app_management.get_app_pin(self.name)
 
-    def set_pin_thread(self, thread: int) -> None:
+    @utils.sync_decorator
+    async def set_pin_thread(self, thread: int) -> None:
         """Sets the thread that the App will be pinned to.
 
         Args:
@@ -537,7 +540,8 @@ class ADAPI:
         """
         self.AD.app_management.set_pin_thread(self.name, thread)
 
-    def get_pin_thread(self) -> int:
+    @utils.sync_decorator
+    async def get_pin_thread(self) -> int:
         """Finds out which thread the App is pinned to.
 
         Returns:
@@ -590,7 +594,8 @@ class ADAPI:
         # Keeping namespace get/set functions for legacy compatibility
         return self.namespace
 
-    def namespace_exists(self, namespace: str) -> bool:
+    @utils.sync_decorator
+    async def namespace_exists(self, namespace: str) -> bool:
         """Check the existence of a namespace in AppDaemon.
 
         See the `namespace documentation <APPGUIDE.html#namespaces>`__ for more information.
@@ -668,7 +673,8 @@ class ADAPI:
 
         return await self.AD.state.remove_namespace(namespace)
 
-    def list_namespaces(self) -> list[str]:
+    @utils.sync_decorator
+    async def list_namespaces(self) -> list[str]:
         """Get a list of all the namespaces in AppDaemon.
 
         Examples:
@@ -909,7 +915,8 @@ class ADAPI:
         """
         return devices.split(",")
 
-    def get_plugin_config(self, namespace: str | None = None) -> Any:
+    @utils.sync_decorator
+    async def get_plugin_config(self, namespace: str | None = None) -> Any:
         """Gets any useful metadata that the plugin may have available.
 
         For instance, for the HASS plugin, this will return Home Assistant configuration
@@ -931,7 +938,8 @@ class ADAPI:
         namespace = namespace or self.namespace
         return self.AD.plugins.get_plugin_meta(namespace)
 
-    def friendly_name(self, entity_id: str, namespace: str | None = None) -> str:
+    @utils.sync_decorator
+    async def friendly_name(self, entity_id: str, namespace: str | None = None) -> str:
         """Gets the Friendly Name of an entity.
 
         Args:
@@ -1380,7 +1388,7 @@ class ADAPI:
     # State
     #
 
-    @overload
+    @overload # single entity
     @utils.sync_decorator
     async def listen_state(
         self,
@@ -1399,7 +1407,7 @@ class ADAPI:
         **kwargs: Any
     ) -> str: ...
 
-    @overload
+    @overload # multiple entities
     @utils.sync_decorator
     async def listen_state(
         self,

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

@@ -355,8 +355,6 @@ class Entity:
 
         Args:
             service (str): The service name, without the domain (e.g "toggle")
-            return_result(bool, option): If `return_result` is provided and set to `True` AD will attempt
-                to wait for the result, and return it after execution
             callback: The non-async callback to be executed when complete.
             **kwargs: Each service has different parameter requirements. This argument
                 allows you to specify a comma-separated list of keyword value pairs, e.g.,

{appdaemon-4.5.2 → appdaemon-4.5.3}/appdaemon/models/config/plugin.py

@@ -100,7 +100,6 @@ class HASSConfig(PluginConfig):
         BeforeValidator(utils.parse_timedelta)
     ] = Field(default_factory=lambda: timedelta(seconds=10))
     """Default timeout for waiting for responses from the websocket connection"""
-    # return_result: bool | None = None
     suppress_log_messages: bool = False
     retry_secs: int = 5
     services_sleep_time: int = 60

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

@@ -260,7 +260,8 @@ class Hass(ADBase, ADAPI):
         """
         return self.get_state(*args, **kwargs)
 
-    def anyone_home(self, person: bool = True, namespace: str | None = None) -> bool:
+    @utils.sync_decorator
+    async def anyone_home(self, person: bool = True, namespace: str | None = None) -> bool:
         """Determines if the house/apartment is occupied.
 
         A convenience function to determine if one or more person is home. Use
@@ -285,10 +286,11 @@ class Hass(ADBase, ADAPI):
             >>>     do something
 
         """
-        details = self.get_tracker_details(person, namespace, copy=False)
+        details = await self.get_tracker_details(person, namespace, copy=False)
         return any(state['state'] == 'home' for state in details.values())
 
-    def everyone_home(self, person: bool = True, namespace: str | None = None) -> bool:
+    @utils.sync_decorator
+    async def everyone_home(self, person: bool = True, namespace: str | None = None) -> bool:
         """Determine if all family's members at home.
 
         A convenience function to determine if everyone is home. Use this in
@@ -312,10 +314,11 @@ class Hass(ADBase, ADAPI):
             >>>    do something
 
         """
-        details = self.get_tracker_details(person, namespace, copy=False)
+        details = await self.get_tracker_details(person, namespace, copy=False)
         return all(state['state'] == 'home' for state in details.values())
 
-    def noone_home(self, person: bool = True, namespace: str | None = None) -> bool:
+    @utils.sync_decorator
+    async def noone_home(self, person: bool = True, namespace: str | None = None) -> bool:
         """Determines if the house/apartment is empty.
 
         A convenience function to determine if no people are at home. Use this
@@ -340,7 +343,7 @@ class Hass(ADBase, ADAPI):
             >>>     do something
 
         """
-        return not self.anyone_home(person, namespace)
+        return not await self.anyone_home(person, namespace)
 
     #
     # Built-in constraints
@@ -1375,7 +1378,7 @@ class Hass(ADBase, ADAPI):
         except (SyntaxError, ValueError):
             return result
 
-    def _template_command(self, command: str, *args: tuple[str, ...]) -> str | list[str]:
+    def _template_command(self, command: str, *args: str) -> str | list[str]:
         """Internal AppDaemon function to format calling a single template command correctly."""
         if len(args) == 0:
             return self.render_template(f'{{{{ {command}() }}}}')
@@ -1478,6 +1481,10 @@ class Hass(ADBase, ADAPI):
         <https://www.home-assistant.io/docs/configuration/templating/#entities-for-an-integration>`_ for more
         information.
         """
+        entities = self._template_command('integration_entities', integration)
+        assert isinstance(entities, list) and all(isinstance(e, str) for e in entities), \
+            'Invalid return type from integration_entities'
+        return entities
 
     # Labels
     # https://www.home-assistant.io/docs/configuration/templating/#labels

appdaemon-4.5.3/appdaemon/version.py

@@ -0,0 +1,2 @@
+__version__ = "4.5.3"
+__version_comments__ = ""

{appdaemon-4.5.2 → appdaemon-4.5.3/appdaemon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appdaemon
-Version: 4.5.2
+Version: 4.5.3
 Summary: Apps for the Home Assistant home automation package.
 Author-email: Andrew I Cockburn <appdaemon@acockburn.com>
 Project-URL: documentation, https://appdaemon.readthedocs.io

appdaemon-4.5.2/appdaemon/version.py

@@ -1,2 +0,0 @@
-__version__ = "4.5.2"
-__version_comments__ = "dev"