fix: improved scheduling

fix: improved scheduling

Author: milsman2

.github/workflows/cache-uv-build.yaml

@@ -7,7 +7,7 @@ jobs:
   build-cache:
     runs-on: ubuntu-latest
     env:
-      UV_VERSION: '0.10.2'
+      UV_VERSION: '0.10.6'
       PYTHON_VERSION: '3.13'
     steps:
       - name: Checkout repository

.github/workflows/docker-build-and-scan.yaml

@@ -46,7 +46,7 @@ jobs:
           tags: ${{  inputs.DOCKER_TAGS }}
       - name: Run Trivy vulnerability scanner (remote)
         if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
-        uses: aquasecurity/trivy-action@0.34.0
+        uses: aquasecurity/trivy-action@0.34.1
         with:
           image-ref: docker.io/${{ inputs.DOCKER_TAGS }}
           format: 'table'

.github/workflows/pytest.yaml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       contents: read
     env:
-      UV_VERSION: '>=0.10.2'
+      UV_VERSION: '>=0.10.6'
       PYTHON_VERSION: '3.13'
     steps:
       - name: Checkout repository

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ jobs:
       dist_artifacts_name: dist
       dist_artifacts_dir: dist
       lock_file_artifact: uv.lock
-      UV_VERSION: '>=0.10.2'
+      UV_VERSION: '>=0.10.6'
       PYTHON_VERSION: '3.13'
       GITHUB_ACTIONS_AUTHOR_NAME: github-actions
       GITHUB_ACTIONS_AUTHOR_EMAIL: actions@users.noreply.github.com

.github/workflows/ruff.yaml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       contents: read
     env:
-      UV_VERSION: '>=0.10.2'
+      UV_VERSION: '>=0.10.6'
       PYTHON_VERSION: '3.13'
 
     steps:

pyproject.toml

@@ -24,14 +24,15 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-build = ["uv >= 0.10.2"]
+build = ["uv >= 0.10.4"]
 
 [build-system]
-requires = ["uv_build >= 0.10.2"]
+requires = ["uv_build >= 0.10.4"]
 build-backend = "uv_build"
 
 [project.scripts]
 sample-python-app = "sample_python_app.main:run_app"
+checks = "sample_python_app.scripts:run_checks"
 
 [tool.semantic_release]
 build_command = """

scripts/checks.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Run project linting, formatting and tests using `uv` as in this repo.
+set -euo pipefail
+
+# Change to repo root (script placed in scripts/)
+cd "$(dirname "$0")/.."
+
+echo "⚡ Running ruff (auto-fix where possible)"
+uv run ruff check . --fix
+
+echo "⚡ Running isort"
+uv run isort .
+
+echo "⚡ Running black"
+uv run black .
+
+echo "⚡ Re-running ruff to catch any remaining issues"
+uv run ruff check .
+
+echo "⚡ Running tests"
+uv run -- coverage run -m pytest
+
+echo "All checks completed."

src/sample_python_app/app/__init__.py

@@ -5,7 +5,7 @@
 """
 
 from sample_python_app.app.lifecycle import start_metrics_server
-from sample_python_app.app.runner import fetch_astro_data
+from sample_python_app.app.runner import fetcher
 from sample_python_app.app.scheduler import start_scheduler
 
-__all__ = ["start_metrics_server", "start_scheduler", "fetch_astro_data"]
+__all__ = ["start_metrics_server", "start_scheduler", "fetcher"]

src/sample_python_app/app/runner.py

@@ -6,6 +6,7 @@
 # app/runner.py
 import json
 import time
+from datetime import date
 
 import httpx
 from pydantic import ValidationError
@@ -14,66 +15,67 @@
     FETCH_COUNTER,
     FETCH_DURATION,
     FETCH_ERRORS,
-    display_astronomical_data,
     setup_logger,
     weather_settings,
 )
 from sample_python_app.exceptions import AppError
 from sample_python_app.services import fetch_astronomical_data_from_api
+from sample_python_app.ui import display_astronomical_data
 
 logger = setup_logger("normal")
 
 
-def fetch_astro_data(*, exit_on_error: bool = True) -> None:
-    """Fetch and display astronomical data once, with error handling."""
-    lat = weather_settings.LOCATION.latitude
-    lon = weather_settings.LOCATION.longitude
-    logger.info(f"Using latitude={lat} longitude={lon}")
+class AstroFetcher:
+    """Fetches astronomical data and displays only once per day."""
 
-    start = time.time()
+    def __init__(self) -> None:
+        """Initialize the AstroFetcher with no last displayed day."""
+        self._last_displayed_day: str | None = None
 
-    try:
-        astro = fetch_astronomical_data_from_api(lat, lon)
-        FETCH_COUNTER.inc()
-    except httpx.HTTPStatusError as exc:
-        _handle_fetch_error(exc, exit_on_error)
-        return
-    except httpx.RequestError as exc:
-        _handle_fetch_error(exc, exit_on_error)
-        return
-    except ValidationError as exc:
-        _handle_fetch_error(exc, exit_on_error)
-        return
-    except json.JSONDecodeError as exc:
-        _handle_fetch_error(exc, exit_on_error)
-        return
-    except AppError as exc:
-        _handle_fetch_error(exc, exit_on_error)
-        return
-    finally:
-        FETCH_DURATION.observe(time.time() - start)
+    def fetch(self, *, exit_on_error: bool = True) -> None:
+        """Fetch astronomical data and display if not already displayed today."""
+        lat = weather_settings.LOCATION.latitude
+        lon = weather_settings.LOCATION.longitude
+        logger.info(f"Using latitude={lat} longitude={lon}")
+        start = time.time()
+        try:
+            astro = fetch_astronomical_data_from_api(lat, lon)
+            FETCH_COUNTER.inc()
+        except (
+            httpx.HTTPStatusError,
+            httpx.RequestError,
+            ValidationError,
+            json.JSONDecodeError,
+            AppError,
+        ) as exc:
+            self._handle_fetch_error(exc, exit_on_error)
+            return
+        finally:
+            FETCH_DURATION.observe(time.time() - start)
+        today_str = date.today().isoformat()
+        if self._last_displayed_day != today_str:
+            display_astronomical_data(astro)
+            self._last_displayed_day = today_str
 
-    display_astronomical_data(astro)
+    def reset_display(self):
+        """Reset the last displayed day so display will occur again."""
+        self._last_displayed_day = None
 
+    def _handle_fetch_error(self, exc: Exception, exit_on_error: bool) -> None:
+        FETCH_ERRORS.inc()
+        if isinstance(exc, httpx.HTTPStatusError):
+            logger.error("HTTP status error: %s", exc)
+        elif isinstance(exc, httpx.RequestError):
+            logger.error("Network error: %s", exc)
+        elif isinstance(exc, ValidationError):
+            logger.error("Validation error: %s", exc)
+        elif isinstance(exc, json.JSONDecodeError):
+            logger.error("JSON decode error: %s", exc)
+        else:
+            logger.exception("Unexpected error")
+        if exit_on_error:
+            raise SystemExit(1) from exc
+        raise AppError(str(exc)) from exc
 
-def _handle_fetch_error(exc: Exception, exit_on_error: bool) -> None:
-    """Handle errors during the fetch operation.
 
-    Log appropriately and update metrics.
-    """
-    FETCH_ERRORS.inc()
-    if isinstance(exc, httpx.HTTPStatusError):
-        logger.error("HTTP status error: %s", exc)
-    elif isinstance(exc, httpx.RequestError):
-        logger.error("Network error: %s", exc)
-    elif isinstance(exc, ValidationError):
-        logger.error("Validation error: %s", exc)
-    elif isinstance(exc, json.JSONDecodeError):
-        logger.error("JSON decode error: %s", exc)
-    else:
-        logger.exception("Unexpected error")
-
-    if exit_on_error:
-        raise SystemExit(1) from exc
-
-    raise AppError(str(exc)) from exc
+fetcher = AstroFetcher()

src/sample_python_app/app/scheduler.py

@@ -1,39 +1,48 @@
-"""Scheduler module for periodic astronomical data fetch.
+"""Scheduler module to fetch astronomical data every 24 hours."""
 
-Initializes and runs the APScheduler job every 24 hours.
-"""
-
-from datetime import datetime
+import signal
+import sys
+from datetime import UTC, datetime
 
 from apscheduler.schedulers.blocking import BlockingScheduler
+from loguru import logger
 
-from sample_python_app.app.runner import fetch_astro_data
+from sample_python_app.app.runner import fetcher
 from sample_python_app.core.logging import setup_logger
 
-logger = setup_logger("normal")
-
 
 def start_scheduler(test_mode: bool = False) -> None:
-    """Start the scheduler to run the astronomical data fetch every 24 hours.
+    """Start the scheduler to fetch astronomical data every 24 hours."""
+    setup_logger("normal")
+    scheduler_logger = logger.bind(component="scheduler")
+
+    if test_mode:
+        # Ensure display will run in tests by clearing any previous state
+        if hasattr(fetcher, "reset_display") and callable(fetcher.reset_display):
+            fetcher.reset_display()
+        fetcher.fetch(exit_on_error=False)
+        return
+
+    scheduler = BlockingScheduler(timezone="UTC")
+
+    def shutdown(signum, frame):
+        del frame
+        scheduler_logger.debug("Shutdown signal received", signal=signum)
+        scheduler.shutdown(wait=True)
+        sys.exit(0)
+
+    signal.signal(signal.SIGTERM, shutdown)
+    signal.signal(signal.SIGINT, shutdown)
 
-    In test_mode, run the scheduled job once and do not block.
-    """
-    scheduler = BlockingScheduler()
     scheduler.add_job(
-        fetch_astro_data,
+        fetcher.fetch,
         trigger="interval",
         hours=24,
-        next_run_time=datetime.now(),
+        next_run_time=datetime.now(UTC),
+        misfire_grace_time=3600,
+        coalesce=True,
+        max_instances=1,
     )
-    logger.info("Scheduled astronomical fetch every 24 hours")
-    if test_mode:
-        # Run the job once for testing, do not block
-        job = scheduler.get_jobs()[0]
-        job.func()
-        logger.info("Ran scheduled job once in test mode")
-        return
-    try:
-        scheduler.start()
-    except (KeyboardInterrupt, SystemExit):
-        logger.info("Scheduler stopped")
-        scheduler.shutdown()
+
+    scheduler_logger.info("Scheduler started")
+    scheduler.start()