fix: refactor data loading services and update dependencies

fix: refactor data loading services and update dependencies

Author: milsman2

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

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

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

@@ -28,16 +28,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build (and maybe push) Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ${{  inputs.DOCKER_PATH_CONTEXT }}
           file: ${{  inputs.DOCKER_BUILD_DOCKERFILE}}
@@ -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.1
+        uses: aquasecurity/trivy-action@0.35.0
         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.8'
+      UV_VERSION: '>=0.10.10'
       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.8'
+      UV_VERSION: '>=0.10.10'
       PYTHON_VERSION: '3.13'
       GITHUB_ACTIONS_AUTHOR_NAME: github-actions
       GITHUB_ACTIONS_AUTHOR_EMAIL: actions@users.noreply.github.com

data/weather/sample.json …a/weather/current_conditions_sample.jsondata/weather/sample.json renamed to data/weather/current_conditions_sample.json data/weather/sample.json renamed to data/weather/current_conditions_sample.json

@@ -6,7 +6,7 @@ readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "apscheduler>=3.11.2",
-    "black>=26.1.0",
+    "black>=26.3.1",
     "coverage>=7.13.2",
     "httpx>=0.28.1",
     "isort>=8.0.1",
@@ -20,14 +20,14 @@ dependencies = [
     "pylint-pydantic>=0.4.1",
     "pytest>=9.0.2",
     "rich>=14.3.2",
-    "ruff>=0.15.2",
+    "ruff>=0.15.6",
 ]
 
 [project.optional-dependencies]
 build = ["uv >= 0.10.7"]
 
 [build-system]
-requires = ["uv_build >= 0.10.7"]
+requires = ["uv_build >= 0.10.10"]
 build-backend = "uv_build"
 
 [project.scripts]

pyproject.toml

@@ -16,13 +16,22 @@
 from sample_python_app.exceptions import AppError
 from sample_python_app.services import (
     CustomHTTPClient,
-    fetch_astronomical_data_from_api,
     fetch_hourly_forecast_from_api,
+    fetch_weather_point_data,
     set_next_hour_forecast_temperature,
 )
 from sample_python_app.ui import display_astronomical_data
 
 
+def extract_astronomical_data(weather_point_data):
+    """Extract the astronomical data from a WeatherPointDataFeature object."""
+    if hasattr(weather_point_data, "properties") and hasattr(
+        weather_point_data.properties, "astronomical_data"
+    ):
+        return weather_point_data.properties.astronomical_data
+    raise AttributeError("Input does not have properties.astronomical_data")
+
+
 class AstroFetcher:
     """Fetches astronomical data and displays only once per day.
 
@@ -45,7 +54,7 @@ def fetch(self, *, exit_on_error: bool = True) -> None:
         start = time.time()
 
         try:
-            astro = fetch_astronomical_data_from_api(lat, lon, client=self.client)
+            weather_point_data = fetch_weather_point_data(lat, lon, client=self.client)
             forecast = fetch_hourly_forecast_from_api(lat, lon, client=self.client)
             set_next_hour_forecast_temperature(forecast, location=f"{lat},{lon}")
             FETCH_COUNTER.inc()
@@ -60,7 +69,8 @@ def fetch(self, *, exit_on_error: bool = True) -> None:
         today = date.today().isoformat()
 
         if self._last_displayed_day != today:
-            display_astronomical_data(astro, forecast)
+            astro_data = extract_astronomical_data(weather_point_data)
+            display_astronomical_data(astro_data, forecast)
             self._last_displayed_day = today
 
     def reset_display(self):
@@ -91,9 +101,6 @@ def shutdown_runner() -> None:
     """Shutdown helper to close long-lived resources owned by the runner.
 
     Call this from application shutdown hooks to ensure the HTTP client is
-    properly closed and connections are released.
+    properly closed and resources are released.
     """
-    try:
-        fetcher.close()
-    except Exception:
-        logger.exception("Error during runner shutdown")
+    fetcher.close()

src/sample_python_app/app/runner.py

@@ -1,6 +1,15 @@
-"""Models package for weather.gov API response parsing."""
+"""Re-export weather models for convenience."""
 
-from sample_python_app.models.forecast_geojson import ForecastFeature
-from sample_python_app.models.weather_gov import AstronomicalData, WeatherGovFeature
+from sample_python_app.models.weather import (
+    AstronomicalData,
+    CurrentConditionsFeature,
+    ForecastFeature,
+    WeatherPointDataFeature,
+)
 
-__all__ = ["WeatherGovFeature", "AstronomicalData", "ForecastFeature"]
+__all__ = [
+    "WeatherPointDataFeature",
+    "ForecastFeature",
+    "AstronomicalData",
+    "CurrentConditionsFeature",
+]

src/sample_python_app/models/__init__.py

@@ -0,0 +1,17 @@
+"""Models package for weather.gov API response parsing."""
+
+from sample_python_app.models.weather.current_conditions_point import (
+    CurrentConditionsFeature,
+)
+from sample_python_app.models.weather.forecast_geojson import ForecastFeature
+from sample_python_app.models.weather.weather_gov import (
+    AstronomicalData,
+    WeatherPointDataFeature,
+)
+
+__all__ = [
+    "WeatherPointDataFeature",
+    "ForecastFeature",
+    "CurrentConditionsFeature",
+    "AstronomicalData",
+]