Merge branch 'test-restructure'

Author: jsl12

.github/workflows/build-deploy.yml

@@ -6,7 +6,7 @@ name: Build and deploy
 
 on:
   push:
-    branches: ["**"]
+    branches: ["dev"]
     tags: ["*"]
   pull_request:
     branches: ["dev"]

.github/workflows/python-tests.yml

@@ -13,21 +13,33 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    # https://github.com/actions/setup-python
-    - name: Set up Python
-      uses: actions/setup-python@v5
+    - name: Install uv and set the python version
+      id: setup-uv
+      uses: astral-sh/setup-uv@v6
       with:
-        python-version: '3.12'
-        cache: 'pip' # caching pip dependencies
-        # Manually set pyproject.toml as the file to use for dependencies
-        # Workaround while waiting for https://github.com/actions/setup-python/issues/529
-        cache-dependency-path: 'pyproject.toml'
-    - name: Run pre-commit
-      uses: pre-commit/[email protected]
-    - uses: pre-commit-ci/[email protected]
-      if: always()
+        version: "0.7.19" # It is considered best practice to pin to a specific uv version
+        # https://github.com/astral-sh/setup-uv?tab=readme-ov-file#enable-caching
+        enable-cache: true
+        cache-dependency-glob: |
+          **/*requirements*.txt
+          **/pyproject.toml
+          **/uv.lock
+
+    - name: Do something if the cache was restored
+      if: steps.setup-uv.outputs.cache-hit == 'true'
+      run: echo "Cache was restored"
+
+    - name: Install the project
+      run: uv sync --all-extras --dev
+
+    - name: Run pre-commit hooks
+      run: uv run pre-commit run --all-files --show-diff-on-failure --color=always
+
+    # - uses: pre-commit-ci/[email protected]
+    #   if: always()
 
   test:
+    needs: lint
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -36,18 +48,46 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    # https://github.com/actions/setup-python
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Install uv and set the python version
+      id: setup-uv
+      uses: astral-sh/setup-uv@v6
       with:
+        # https://docs.astral.sh/uv/guides/integration/github/#multiple-python-versions
         python-version: ${{ matrix.python-version }}
-        cache: 'pip' # caching pip dependencies
-        # Manually set 'dev-requirements.txt' as the file to use for dependencies, since `requirements.txt` contains runtime dependencies.
-        cache-dependency-path: 'dev-requirements.txt'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r dev-requirements.txt
-    - name: Test with pytest
+        version: "0.7.19" # It is considered best practice to pin to a specific uv version
+        # https://github.com/astral-sh/setup-uv?tab=readme-ov-file#enable-caching
+        enable-cache: true
+        cache-dependency-glob: |
+          **/*requirements*.txt
+          **/pyproject.toml
+          **/uv.lock
+
+    - name: Do something if the cache was restored
+      if: steps.setup-uv.outputs.cache-hit == 'true'
+      run: echo "Cache was restored"
+
+    - name: Install the project
+      run: uv sync --all-extras --dev
+
+    - name: Run tests
+      # For example, using `pytest`
       run: |
-        python -m pytest
+        uv run pytest tests/unit
+        uv run pytest -m ci
+
+    # # https://github.com/actions/setup-python
+    # - name: Set up Python ${{ matrix.python-version }}
+    #   uses: actions/setup-python@v5
+    #   with:
+    #     python-version: ${{ matrix.python-version }}
+    #     cache: 'pip' # caching pip dependencies
+    #     # Manually set 'dev-requirements.txt' as the file to use for dependencies, since `requirements.txt` contains runtime dependencies.
+    #     cache-dependency-path: 'dev-requirements.txt'
+    # - name: Install dependencies
+    #   run: |
+    #     python -m pip install --upgrade pip
+    #     pip install -r dev-requirements.txt
+    # - name: Test with pytest
+    #   run: |
+    #     python -m pytest tests/unit
+    #     python -m pytest -m ci

.gitignore

@@ -65,6 +65,7 @@ target/
 venv
 .venv
 uv.lock
+*.ipynb
 
 # Mac stuff
 .DS_Store

appdaemon/logging.py

@@ -363,7 +363,7 @@ def get_time(logger, record, format=None):
             ts = logger.AD.sched.get_now_sync().astimezone(logger.tz)
         else:
             if logger.tz is not None:
-                ts = datetime.datetime.now(datetime.UTC).astimezone(logger.tz)
+                ts = datetime.datetime.now(datetime.timezone.utc).astimezone(logger.tz)
             else:
                 ts = datetime.datetime.now()
         if format is not None:

appdaemon/scheduler.py

@@ -6,7 +6,7 @@
 import uuid
 from collections import OrderedDict
 from copy import deepcopy
-from datetime import UTC, datetime, time, timedelta, timezone
+from datetime import datetime, time, timedelta, timezone
 from logging import Logger
 from typing import TYPE_CHECKING, Any, Callable
 
@@ -87,7 +87,7 @@ def stop(self):
         self.stopping = True
 
     async def set_start_time(self, starttime: datetime | None = None):
-        self.last_fired = datetime.now(UTC).astimezone(self.AD.tz)
+        self.last_fired = datetime.now(timezone.utc).astimezone(self.AD.tz)
         if not self.AD.real_time:
             self.logger.info("Starting time travel ...")
             self.logger.info("Setting clocks to %s", await self.get_now())

pyproject.toml

@@ -97,6 +97,9 @@ asyncio_default_fixture_loop_scope = "session"
 addopts = [
     "--import-mode=importlib",
 ]
+markers = [
+    "ci: mark test to run in CI environment",
+]
 
 # black configuration
 [tool.black]

tests/conf/apps/scheduler/apps.yaml

@@ -1,7 +1,16 @@
 run_every:
   module: run_every
   class: RunEvery
+  disable: true
+
+run_every_now:
+  module: run_every
+  class: RunEveryNow
+  disable: true
+  interval: 0.75
+  msg: "run_every_now"
 
 run_hourly:
   module: run_every
   class: RunHourly
+  disable: true

tests/conf/apps/scheduler/run_every.py

@@ -1,6 +1,8 @@
 from datetime import timedelta
 
-from appdaemon import ADAPI
+from appdaemon import utils
+from appdaemon.adapi import ADAPI
+from appdaemon.adbase import ADBase
 
 
 class RunEvery(ADAPI):
@@ -17,15 +19,36 @@ def start_realtime(self) -> None:
         self.run_every(self.scheduled_callback, start="now", interval=timedelta(seconds=1), data="start now")
 
     def start_timewarp(self) -> None:
-        self.run_every(self.scheduled_callback, start="now", interval="45:00", data="start now")
-        self.run_every(self.scheduled_callback, start="now + 5:00", interval=timedelta(hours=1.37), data="start later")
+        # self.run_every(self.scheduled_callback, start="now", interval="02:37:45.7", data="start now")
+        self.run_every(self.scheduled_callback, start="now + 02:00:00", interval=timedelta(hours=1), data="start later")
         # self.run_every(self.scheduled_callback, start="sunrise", data='sunrise')
         # self.run_every(self.scheduled_callback, start="sunrise - 01:00:00", data='sunrise negative offset')
 
     def scheduled_callback(self, data: str, **kwargs) -> None:
         self.log(f"{data}", level="DEBUG")
 
 
+class RunEveryNow(ADBase):
+    adapi: ADAPI
+
+    def initialize(self) -> None:
+        self.adapi = self.get_ad_api()
+        self.adapi.set_log_level("DEBUG")
+        self.adapi.run_every(
+            self.scheduled_callback,
+            start="now",
+            interval=self.interval,
+            data=self.args['msg']
+        )
+
+    def scheduled_callback(self, data: str, **kwargs) -> None:
+        self.adapi.log(f"{data}", level="DEBUG")
+
+    @property
+    def interval(self) -> timedelta:
+        return utils.parse_timedelta(self.args["interval"])
+
+
 class RunHourly(RunEvery):
     def initialize(self) -> None:
         # self.set_log_level("DEBUG")

tests/conftest.py

@@ -1,17 +1,13 @@
 import asyncio
 import logging
-from datetime import date, datetime, time
-from functools import partial
-from signal import Signals, raise_signal
-from typing import Callable
+from datetime import datetime
 
 import pytest
 import pytest_asyncio
 from astral import LocationInfo
 from astral.location import Location
-from pytz import BaseTzInfo, timezone
 
-from appdaemon import AppDaemon, utils
+from appdaemon import AppDaemon
 from appdaemon.logging import Logging
 from appdaemon.models.config.appdaemon import AppDaemonConfig
 
@@ -62,7 +58,7 @@ def ad_cfg() -> AppDaemonConfig:
             module_debug={
                 "_app_management": "DEBUG",
                 # "_events": "DEBUG",
-                # "_utility": "DEBUG",
+                "_utility": "DEBUG",
             },
         )
     )
@@ -88,18 +84,20 @@ async def ad_obj(logging_obj: Logging, running_loop, ad_cfg: AppDaemonConfig):
     # This can't be done here because the test might set the app directory to a different location
     # await ad.app_management.check_app_updates(mode=UpdateMode.TESTING)
 
-    # ad.start()
+    ad.start()
     yield ad
     logger.info('Back to fixture scope, stopping AppDaemon')
-    pass
+    if stopping_tasks := ad.stop():
+        logger.debug("Waiting for stopping tasks to complete")
+        await stopping_tasks
 
 
-@pytest.fixture(scope="module")
-def ad_obj_fast(logging_obj: Logging, running_loop, ad_cfg: AppDaemonConfig):
+@pytest_asyncio.fixture(scope="module")
+async def ad_obj_fast(logging_obj: Logging, running_loop, ad_cfg: AppDaemonConfig):
     logger = logging.getLogger("AppDaemon._test")
     logger.info(f"Passed loop: {hex(id(running_loop))}")
 
-    ad_cfg.timewarp = 5000
+    ad_cfg.timewarp = 2000
     ad_cfg.starttime = ad_cfg.time_zone.localize(datetime(2025, 6, 25, 0, 0, 0))
 
     ad = AppDaemon(
@@ -113,10 +111,11 @@ def ad_obj_fast(logging_obj: Logging, running_loop, ad_cfg: AppDaemonConfig):
         logger.propagate = True
         logger.setLevel("DEBUG")
 
-    ad.start()
+    # ad.start()
     yield ad
-    raise_signal(Signals.SIGTERM)
+    # raise_signal(Signals.SIGTERM)
     # ad.stop()
+    pass
 
 
 @pytest.fixture
@@ -130,63 +129,3 @@ def location() -> Location:
             longitude=-74.0060,
         )
     )
-
-
-@pytest.fixture
-def tz(location: Location) -> BaseTzInfo:
-    return timezone(location.timezone)
-
-
-@pytest.fixture
-def default_date() -> date:
-    return date(2025, 6, 20)
-
-
-@pytest.fixture
-def tomorrow_date(default_date: date) -> date:
-    return default_date.replace(day=default_date.day + 1)
-
-
-@pytest.fixture
-def now_creator(default_date: date, tz: BaseTzInfo):
-    def create_time(hour: int):
-        naive = datetime.combine(default_date, time(hour, 0, 0))
-        return tz.localize(naive)
-
-    return create_time
-
-
-@pytest.fixture
-def early_now(now_creator: Callable[..., datetime]) -> datetime:
-    now = now_creator(4)
-    assert now.isoformat() == "2025-06-20T04:00:00-04:00"
-    return now
-
-
-@pytest.fixture
-def default_now(now_creator: Callable[..., datetime]) -> datetime:
-    now = now_creator(12)
-    assert now.isoformat() == "2025-06-20T12:00:00-04:00"
-    return now
-
-
-@pytest.fixture
-def late_now(now_creator: Callable[..., datetime]) -> datetime:
-    now = now_creator(23)
-    assert now.isoformat() == "2025-06-20T23:00:00-04:00"
-    return now
-
-
-@pytest.fixture
-def parser(tz: BaseTzInfo, default_now: datetime) -> partial[datetime]:
-    return partial(utils.parse_datetime, now=default_now, timezone=tz)
-
-
-@pytest.fixture
-def parser_location(tz: BaseTzInfo, location: Location) -> partial[datetime]:
-    return partial(utils.parse_datetime, location=location, timezone=tz)
-
-
-@pytest.fixture
-def time_at_elevation(location: Location, default_now: datetime) -> Callable[..., datetime]:
-    return partial(location.time_at_elevation, date=default_now.date(), local=True)