Add signed URLs to dashboard images
这个提交存在于:
父节点
030722dc3c
当前提交
c267c1ad39
共有 2 个文件被更改,包括 18 次插入 和 0 次删除
|
|
@ -5,9 +5,11 @@ from __future__ import annotations
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
|
from backend.dto.common import ApiError
|
||||||
from core.config_service import ConfigService, ImageStudioConfig
|
from core.config_service import ConfigService, ImageStudioConfig
|
||||||
from database.db_helper import Database, REPO_ROOT
|
from database.db_helper import Database, REPO_ROOT
|
||||||
from database.repositories.job_repository import JobRepository
|
from database.repositories.job_repository import JobRepository
|
||||||
|
from backend.services.media_service import MediaService
|
||||||
|
|
||||||
|
|
||||||
class DashboardService:
|
class DashboardService:
|
||||||
|
|
@ -18,6 +20,7 @@ class DashboardService:
|
||||||
):
|
):
|
||||||
self.database = database
|
self.database = database
|
||||||
self.config_service = config_service or ConfigService()
|
self.config_service = config_service or ConfigService()
|
||||||
|
self.media_service = MediaService(self.config_service)
|
||||||
|
|
||||||
def get_summary(self) -> dict[str, Any]:
|
def get_summary(self) -> dict[str, Any]:
|
||||||
config = self.config_service.load()
|
config = self.config_service.load()
|
||||||
|
|
@ -75,11 +78,21 @@ class DashboardService:
|
||||||
"profile_id": row["profile_id"],
|
"profile_id": row["profile_id"],
|
||||||
"thumbnail_uri": row["thumbnail_uri"],
|
"thumbnail_uri": row["thumbnail_uri"],
|
||||||
"image_uri": row["image_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"]),
|
"created_at": str(row["created_at"]),
|
||||||
}
|
}
|
||||||
for row in rows
|
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]:
|
def _storage_summary(self, config: ImageStudioConfig) -> dict[str, int]:
|
||||||
images_bytes = _directory_size(_resolve_data_path(config.storage.images_path))
|
images_bytes = _directory_size(_resolve_data_path(config.storage.images_path))
|
||||||
thumbnails_bytes = _directory_size(_resolve_data_path(config.storage.thumbnails_path))
|
thumbnails_bytes = _directory_size(_resolve_data_path(config.storage.thumbnails_path))
|
||||||
|
|
|
||||||
|
|
@ -223,6 +223,8 @@ storage:
|
||||||
},
|
},
|
||||||
self.ctx,
|
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(
|
self.image_service.create_image(
|
||||||
{
|
{
|
||||||
"node_id": detail.nodes[0].node_id,
|
"node_id": detail.nodes[0].node_id,
|
||||||
|
|
@ -243,6 +245,9 @@ storage:
|
||||||
self.assertEqual(data["active_profiles"], 1)
|
self.assertEqual(data["active_profiles"], 1)
|
||||||
self.assertEqual(data["queue"], {"pending": 0, "running": 0, "failed": 0, "dead_letter": 0})
|
self.assertEqual(data["queue"], {"pending": 0, "running": 0, "failed": 0, "dead_letter": 0})
|
||||||
self.assertEqual(len(data["recent_images"]), 1)
|
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)
|
self.assertGreaterEqual(data["storage"]["total_bytes"], 8)
|
||||||
|
|
||||||
def test_dashboard_summary_uses_real_queue_counts(self):
|
def test_dashboard_summary_uses_real_queue_counts(self):
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用