diff --git a/backend/services/dashboard_service.py b/backend/services/dashboard_service.py index 6a504a4..bdbb3e7 100644 --- a/backend/services/dashboard_service.py +++ b/backend/services/dashboard_service.py @@ -5,9 +5,11 @@ from __future__ import annotations from pathlib import Path from typing import Any +from backend.dto.common import ApiError from core.config_service import ConfigService, ImageStudioConfig from database.db_helper import Database, REPO_ROOT from database.repositories.job_repository import JobRepository +from backend.services.media_service import MediaService class DashboardService: @@ -18,6 +20,7 @@ class DashboardService: ): self.database = database self.config_service = config_service or ConfigService() + self.media_service = MediaService(self.config_service) def get_summary(self) -> dict[str, Any]: config = self.config_service.load() @@ -75,11 +78,21 @@ class DashboardService: "profile_id": row["profile_id"], "thumbnail_uri": row["thumbnail_uri"], "image_uri": row["image_uri"], + "thumbnail_url": self._signed_url(row["thumbnail_uri"]), + "image_url": self._signed_url(row["image_uri"]), "created_at": str(row["created_at"]), } for row in rows ] + def _signed_url(self, uri: str | None) -> str | None: + if not uri: + return None + try: + return self.media_service.sign_media(uri)["url"] + except ApiError: + return None + def _storage_summary(self, config: ImageStudioConfig) -> dict[str, int]: images_bytes = _directory_size(_resolve_data_path(config.storage.images_path)) thumbnails_bytes = _directory_size(_resolve_data_path(config.storage.thumbnails_path)) diff --git a/tests/test_s2_routes.py b/tests/test_s2_routes.py index 7de0839..c697b51 100644 --- a/tests/test_s2_routes.py +++ b/tests/test_s2_routes.py @@ -223,6 +223,8 @@ storage: }, self.ctx, ) + (self.root / "images" / "sample.png").write_bytes(b"image") + (self.root / "thumbnails" / "sample.webp").write_bytes(b"thumb") self.image_service.create_image( { "node_id": detail.nodes[0].node_id, @@ -243,6 +245,9 @@ storage: self.assertEqual(data["active_profiles"], 1) self.assertEqual(data["queue"], {"pending": 0, "running": 0, "failed": 0, "dead_letter": 0}) self.assertEqual(len(data["recent_images"]), 1) + self.assertTrue(data["recent_images"][0]["image_url"].startswith("/api/v1/plugins/extensions/")) + self.assertTrue(data["recent_images"][0]["thumbnail_url"].startswith("/api/v1/plugins/extensions/")) + self.assertNotIn(str(self.root), str(data["recent_images"])) self.assertGreaterEqual(data["storage"]["total_bytes"], 8) def test_dashboard_summary_uses_real_queue_counts(self):