fixes for typing issues

Author: jsl12

appdaemon/adapi.py

@@ -23,7 +23,7 @@
 from appdaemon.logging import Logging
 from appdaemon.models.config.app import AppConfig
 from appdaemon.parse import resolve_time_str
-from appdaemon.state import StateCallback
+from appdaemon.state import StateCallbackType
 
 T = TypeVar("T")
 
@@ -787,7 +787,7 @@ def get_ad_version() -> str:
     async def add_entity(
         self,
         entity_id: str,
-        state: str | dict[str, Any],
+        state: Any,
         attributes: dict | None = None,
         namespace: str | None = None,
     ) -> None:
@@ -1402,7 +1402,7 @@ async def deregister_route(self, handle: str) -> None:
     @utils.sync_decorator
     async def listen_state(
         self,
-        callback: StateCallback,
+        callback: StateCallbackType,
         entity_id: str | None,
         namespace: str | None = None,
         new: str | Callable[[Any], bool] | None = None,
@@ -1421,7 +1421,7 @@ async def listen_state(
     @utils.sync_decorator
     async def listen_state(
         self,
-        callback: StateCallback,
+        callback: StateCallbackType,
         entity_id: Iterable[str],
         namespace: str | None = None,
         new: str | Callable[[Any], bool] | None = None,
@@ -1439,7 +1439,7 @@ async def listen_state(
     @utils.sync_decorator
     async def listen_state(
         self,
-        callback: StateCallback,
+        callback: StateCallbackType,
         entity_id: str | Iterable[str] | None = None,
         namespace: str | None = None,
         new: str | Callable[[Any], bool] | None = None,

appdaemon/entity.py

@@ -3,14 +3,14 @@
 from collections import defaultdict
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass, field
-from datetime import timedelta
+from datetime import datetime, timedelta
 from logging import Logger
 from typing import TYPE_CHECKING, Any, overload
 
 from appdaemon import utils
 
 from .exceptions import TimeOutException
-from .state import StateCallback
+from .state import StateCallbackType
 
 if TYPE_CHECKING:
     from appdaemon import ADAPI
@@ -28,8 +28,6 @@ class Entity:
     name: str  = field(init=False)
 
     adapi: "ADAPI"
-    namespace: str
-    entity_id: str | None
     _async_events: dict[str, asyncio.Event] = field(default_factory=lambda: defaultdict(asyncio.Event))
     # states_attrs = EntityAttrs()
 
@@ -115,7 +113,7 @@ async def set_state(
 
         """
         self.logger.debug("set state: %s, %s from %s", self.entity_id, kwargs, self.name)
-        return await self.adapi.set_state(
+        return await self.adapi.set_state( # pyright: ignore[reportGeneralTypeIssues]
             entity_id=self.entity_id,
             namespace=self.namespace,
             state=state,
@@ -175,7 +173,7 @@ async def get_state(
 
         """
         self.logger.debug("get state: %s, %s from %s", self.entity_id, self.namespace, self.name)
-        return await self.adapi.get_state(
+        return await self.adapi.get_state( # pyright: ignore[reportGeneralTypeIssues]
             namespace=self.namespace,
             entity_id=self.entity_id,
             attribute=attribute,
@@ -187,7 +185,7 @@ async def get_state(
     @utils.sync_decorator
     async def listen_state(
         self,
-        callback: StateCallback,
+        callback: StateCallbackType,
         new: str | Callable[[Any], bool] | None = None,
         old: str | Callable[[Any], bool] | None = None,
         duration: str | int | float | timedelta | None = None,
@@ -197,10 +195,11 @@ async def listen_state(
         oneshot: bool = False,
         pin: bool | None = None,
         pin_thread: int | None = None,
+        **kwargs: Any,
     ) -> str: ...
 
     @utils.sync_decorator
-    async def listen_state(self, callback: StateCallback, **kwargs: Any) -> str:
+    async def listen_state(self, callback: StateCallbackType, **kwargs: Any) -> str:
         """Registers a callback to react to state changes.
 
         This function allows the user to register a callback for a wide variety of state changes.
@@ -301,15 +300,15 @@ async def listen_state(self, callback: StateCallback, **kwargs: Any) -> str:
 
             >>> self.handle = self.my_entity.listen_state(self.my_callback, new="on", duration=60, immediate=True)
         """
-        return await self.adapi.listen_state(
+        return await self.adapi.listen_state( # pyright: ignore[reportGeneralTypeIssues]
             callback,
             entity_id=self.entity_id,
             namespace=self.namespace,
             **kwargs,
         )
 
     @utils.sync_decorator
-    async def add(self, state: str | int | float = None, attributes: dict = None) -> None:
+    async def add(self, state: str | int | float | None = None, attributes: dict[str, Any] | None = None) -> None:
         """Adds a non-existent entity, by creating it within a namespaces.
 
         It should be noted that this api call, is mainly for creating AD internal entities.
@@ -383,9 +382,9 @@ async def call_service(
     async def wait_state(
         self,
         state: Any,
-        attribute: str | int = None,
+        attribute: str | None = None,
         duration: int | float = 0,
-        timeout: int | float = None,
+        timeout: int | float | None = None,
     ) -> None:
         """Used to wait for the state of an entity's attribute
 
@@ -419,7 +418,7 @@ async def wait_state(
         async_event = self._async_events[wait_id]
 
         try:
-            handle = await self.listen_state(
+            handle = await self.listen_state( # pyright: ignore[reportGeneralTypeIssues]
                 self.entity_state_changed,
                 new=state,
                 attribute=attribute,
@@ -556,7 +555,7 @@ def entity_id(self) -> str:
         return self._entity_id
 
     @entity_id.setter
-    def entity_id(self, new: str) -> str:
+    def entity_id(self, new: str) -> None:
         """Get the entity's entity_id"""
         self._entity_id = new
         try:
@@ -574,7 +573,6 @@ def state(self) -> Any:
     @property
     def namespace(self) -> str:
         """Get the entity's namespace name"""
-
         return self._namespace
 
     @namespace.setter
@@ -592,15 +590,15 @@ def friendly_name(self) -> str:
         return self.attributes.get("friendly_name", self.entity_id)
 
     @property
-    def last_changed(self) -> str:
+    def last_changed(self) -> str | None:
         """Get the entity's last changed time in iso format"""
         return self._simple_state.get("last_changed")
 
     @property
     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_datetime(time_str, aware=True)
+            compare = datetime.fromisoformat(time_str)
             now = self.AD.sched.get_now_sync()
             return (now - compare)
 

appdaemon/exceptions.py

@@ -3,7 +3,6 @@
 
 """
 import asyncio
-from contextlib import contextmanager
 import functools
 import inspect
 import json
@@ -12,6 +11,7 @@
 import traceback
 from abc import ABC
 from collections.abc import Iterable
+from contextlib import contextmanager
 from dataclasses import dataclass
 from logging import Logger
 from pathlib import Path
@@ -344,8 +344,9 @@ class BadAppConfigFile(AppDaemonException):
     path: Path
 
 
+@dataclass
 class TimeOutException(AppDaemonException):
-    pass
+    msg: str
 
 
 class StartupAbortedException(AppDaemonException):

appdaemon/parse.py

@@ -313,7 +313,7 @@ def parse_datetime(
             ISO 8601 datetime strings, which helps with testing.
         location (Location, optional): Location used for sunrise/sunset parsing. This is needed in order to parse
             sunset/sunrise times from the input.
-        today (bool, optional): If `True`, forces the result to have the same date as the `now` datetime. `False` is 
+        today (bool, optional): If `True`, forces the result to have the same date as the `now` datetime. `False` is
             effectively equivalent to `next`. The default value is `None`, which doesn't try to coerce the output at
             all. This results in slightly different date results for different input types. For example, a time string
             will be given the same date as the one in the `now` datetime, but a sun event string will be the datetime

appdaemon/scheduler.py

@@ -41,6 +41,7 @@ class Scheduler:
     diag: Logger
 
     schedule: dict[str, dict[str, Any]]
+    location: Location
 
     name: str = "_scheduler"
     active_event: asyncio.Event
@@ -54,7 +55,6 @@ def __init__(self, ad: "AppDaemon"):
         self.last_fired = None
         self.sleep_task = None
         self.timer_resetted = False
-        self.location = None
         self.schedule = {}
 
         self.active_event = asyncio.Event()
@@ -854,10 +854,25 @@ async def parse_datetime(
         today: bool | None = None,
         days_offset: int = 0
     ) -> datetime:  # fmt: skip
-        now = await self.get_now()
+        """Parse a variety of inputs into a datetime object.
+
+        Args:
+            input_ (str | time | datetime): The input to parse. Can be a string, time, or datetime object.
+            aware (bool, optional): If `False`, the resulting datetime will be naive (without timezone). Defaults to
+                `True`.
+            today (bool, optional): If `True`, forces the result to have the same date as the `now` datetime. `False` is
+                effectively equivalent to `next`. The default value is `None`, which doesn't try to coerce the output at
+                all. This results in slightly different date results for different input types. For example, a time string
+                will be given the same date as the one in the `now` datetime, but a sun event string will be the datetime
+                of the next one.
+            days_offset (int, optional): Number of days to offset from the current date for sunrise/sunset parsing. If
+                this is negative, this will unset the `today` argument, which allows the result to be in the past.
+        """
+        # Need to force timezone during time-travel mode
+        now = (await self.get_now()).astimezone(self.AD.tz)
         return parse.parse_datetime(
             input_=input_,
-            now=now.astimezone(self.AD.tz), # Need to force timezone during time-travel mode
+            now=now,
             location=self.location,
             today=today,
             days_offset=days_offset,