Merge branch 'dev' of https://github.com/AppDaemon/appdaemon into dev

Author: acockburn

.github/workflows/build-deploy.yml

@@ -56,7 +56,7 @@ jobs:
         working-directory: docs
       # Save the generated documentation as an artifact in Github
       - name: Upload documentation
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: python-doc-package
           path: docs/_build/
@@ -87,7 +87,7 @@ jobs:
       - name: Build Python package
         run: python -m build
       - name: Upload Python package
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: python-package
           path: dist/
@@ -111,12 +111,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Download Python package
-        uses: actions/download-artifact@v6.0.0
+        uses: actions/download-artifact@v7.0.0
         with:
           name: python-package
           path: dist/
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v3.12.0
       # Login against a Docker registry (only with a tag or push on `dev` branch)
       # https://github.com/docker/login-action
       - name: Log into Docker Hub
@@ -129,7 +129,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v5.9.0
+        uses: docker/metadata-action@v5.10.0
         with:
           images: ${{ env.IMAGE_NAME }}
           # Customize the generation of Docker `latest` tag

appdaemon/__main__.py

@@ -296,7 +296,6 @@ def __init__(self, args: argparse.Namespace) -> None:
             self.dep_manager = DependencyManager.from_app_directory(
                 self.model.appdaemon.app_dir,
                 exclude=self.model.appdaemon.exclude_dirs,
-                config_suffix=self.model.appdaemon.ext,
             )
 
         except Exception as e:

appdaemon/adapi.py

@@ -2975,7 +2975,9 @@ async def run_at(
                 _, offset = resolve_time_str(start_str, now=now, location=self.AD.sched.location)
                 func = functools.partial(func, *args, repeat=True, offset=offset)
             case _:
-                start = await self.AD.sched.parse_datetime(start, aware=True)
+                # For run_at, always schedule for the next occurrence (today=False)
+                # This ensures that times in the past are scheduled for tomorrow
+                start = await self.AD.sched.parse_datetime(start, aware=True, today=False)
                 func = functools.partial(
                     self.AD.sched.insert_schedule,
                     name=self.name,

appdaemon/app_management.py

@@ -21,7 +21,6 @@
 
 from pydantic import ValidationError
 
-
 from appdaemon.dependency import DependencyResolutionFail, find_all_dependents, get_full_module_name
 from appdaemon.dependency_manager import DependencyManager
 from appdaemon.models.config import AllAppConfig, AppConfig, GlobalModule
@@ -33,9 +32,9 @@
 from .models.internal.app_management import LoadingActions, ManagedObject, UpdateActions, UpdateMode
 
 if TYPE_CHECKING:
-    from .appdaemon import AppDaemon
-    from .adbase import ADBase
     from .adapi import ADAPI
+    from .adbase import ADBase
+    from .appdaemon import AppDaemon
     from .plugin_management import PluginBase
 
 T = TypeVar("T")
@@ -87,7 +86,6 @@ class AppManagement:
 
     def __init__(self, ad: "AppDaemon"):
         self.AD = ad
-        self.ext = self.AD.config.ext
         self.logger = ad.logging.get_child(self.name)
         self.error = ad.logging.get_error()
         self.diag = ad.logging.get_diag()
@@ -527,12 +525,11 @@ async def safe_create(self: "AppManagement"):
                     module_name,
                 )
 
-                if (pin := cfg.pin_thread) and pin >= self.AD.threading.total_threads:
+                if (pin := cfg.pin_thread) is not None and pin >= self.AD.threading.total_threads:
                     raise ade.PinOutofRange(pin_thread=pin, total_threads=self.AD.threading.total_threads)
-                elif (obj := self.objects.get(app_name)) and obj.pin_thread is not None:
+                if (obj := self.objects.get(app_name)) and obj.pin_thread is not None:
                     pin = obj.pin_thread
-                else:
-                    pin = -1
+                # else pin is already None from cfg.pin_thread
 
                 # This module should already be loaded and stored in sys.modules
                 mod_obj = await utils.run_in_executor(self, importlib.import_module, module_name)
@@ -585,7 +582,7 @@ def add_plugin_object(self, name: str, object: "PluginBase") -> None:
             type="plugin",
             object=object,
             pin_app=False,
-            pin_thread=-1,
+            pin_thread=None,
             running=False,
         )
 
@@ -1047,8 +1044,8 @@ def get_app_config_files(self) -> set[Path]:
         return set(
             utils.recursive_get_files(
                 base=self.AD.app_dir.resolve(),
-                suffix=self.ext,
-                exclude=set(self.AD.exclude_dirs),
+                suffix={".yaml", ".toml"},
+                exclude=set(self.AD.exclude_dirs) | {"ruff.toml", "pyproject.toml", "secrets.yaml"},
             )
         )
 
@@ -1323,7 +1320,7 @@ def create_app(self, app: str = None, **kwargs):
             return False
 
         app_directory: Path = self.AD.app_dir / kwargs.pop("app_dir", "ad_apps")
-        app_file: Path = app_directory / kwargs.pop("app_file", f"{app}{self.ext}")
+        app_file: Path = app_directory / kwargs.pop("app_file", f"{app}{self.AD.config.ext}")
         app_directory = app_file.parent  # in case the given app_file is multi level
 
         try:

appdaemon/callbacks.py

@@ -80,7 +80,7 @@ async def get_callback_entries(self, type="all"):
                         )
                         callbacks[name][str(uuid_)]["pin_thread"] = (
                             self.callbacks[name][uuid_]["pin_thread"]
-                            if self.callbacks[name][uuid_]["pin_thread"] != -1
+                            if self.callbacks[name][uuid_]["pin_thread"] is not None
                             else "None"
                         )
         return callbacks

appdaemon/dependency_manager.py

@@ -1,7 +1,6 @@
 from abc import ABC
 from copy import deepcopy
 from dataclasses import InitVar, dataclass, field
-from functools import partial
 from pathlib import Path
 from typing import Iterable
 
@@ -16,7 +15,7 @@ class Dependencies(ABC):
     """Wraps an instance of ``FileCheck`` with a corresponding set of dependency graphs."""
 
     files: FileCheck = field(repr=False)
-    ext: str = field(init=False)  # this has to be defined by the children classes
+    ext: str | set[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[tuple[Path, float]] = field(default_factory=set, init=False)
@@ -39,7 +38,13 @@ def refresh_dep_graph(self):
 
     @classmethod
     def from_path(cls, path: Path):
-        return cls.from_paths(path.rglob(f"*{cls.ext}"))
+        return cls.from_paths(
+            utils.recursive_get_files(
+                base=path,
+                suffix={".yaml", ".toml"},
+                exclude={"ruff.toml", "pyproject.toml", "secrets.yaml"},
+            )
+        )
 
     @classmethod
     def from_paths(cls, paths: Iterable[Path]):
@@ -90,7 +95,6 @@ def modules_to_delete(self) -> list[str]:
 @dataclass
 class AppDeps(Dependencies):
     app_config: AllAppConfig = field(init=False, repr=False)
-    ext: str = ".yaml"
 
     def __post_init__(self):
         self.app_config = AllAppConfig.from_config_files(self.files)
@@ -157,7 +161,6 @@ def from_app_directory(
         cls,
         app_dir: Path,
         exclude: str | Iterable[str] | None = None,
-        config_suffix: str = ".yaml",
     ) -> "DependencyManager":
         """Creates a new instance of the dependency manager from the given app directory"""
         match exclude:
@@ -168,12 +171,14 @@ def from_app_directory(
             case _:
                 exclude_set = set(exclude)
 
-        get_files = partial(utils.recursive_get_files, base=app_dir, exclude=exclude_set)
         return cls(
-            # python_files=get_files(suffix=".py"),
             python_files=list(),
-            config_files=get_files(suffix=config_suffix)
-        )  # fmt: skip
+            config_files=utils.recursive_get_files(
+                base=app_dir,
+                suffix={".yaml", ".toml"},
+                exclude=exclude_set,
+            )
+        )
 
     @property
     def app_config_files(self) -> set[Path]: