Add signed URLs to material routes
这个提交存在于:
父节点
74604654e8
当前提交
10a112c623
共有 2 个文件被更改,包括 77 次插入 和 13 次删除
|
|
@ -4,8 +4,11 @@ from __future__ import annotations
|
||||||
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
|
from backend.dto.common import ApiError
|
||||||
|
from backend.dto.material_dto import Material, MaterialListResult
|
||||||
from backend.routes.common import handle_request
|
from backend.routes.common import handle_request
|
||||||
from backend.services.material_service import MaterialService
|
from backend.services.material_service import MaterialService
|
||||||
|
from backend.services.media_service import MediaService
|
||||||
from core.audit_service import AuditService
|
from core.audit_service import AuditService
|
||||||
from core.identity import RequestContext
|
from core.identity import RequestContext
|
||||||
from core.security import require_authenticated, require_permission
|
from core.security import require_authenticated, require_permission
|
||||||
|
|
@ -73,18 +76,21 @@ def list_materials(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
query: dict[str, Any] | None = None,
|
query: dict[str, Any] | None = None,
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
params = query or {}
|
params = query or {}
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_authenticated(ctx)
|
require_authenticated(ctx)
|
||||||
return material_service.list_materials(
|
result = material_service.list_materials(
|
||||||
category_id=_optional_str(params.get("category_id")),
|
category_id=_optional_str(params.get("category_id")),
|
||||||
keyword=_optional_str(params.get("keyword")),
|
keyword=_optional_str(params.get("keyword")),
|
||||||
page=_int_or_default(params.get("page"), 1),
|
page=_int_or_default(params.get("page"), 1),
|
||||||
page_size=_int_or_default(params.get("page_size"), 30),
|
page_size=_int_or_default(params.get("page_size"), 30),
|
||||||
).to_dict()
|
)
|
||||||
|
return _serialize_material_list(result, signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -93,12 +99,14 @@ def create_material(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
payload: dict[str, Any],
|
payload: dict[str, Any],
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_permission(ctx, "can_manage_materials")
|
require_permission(ctx, "can_manage_materials")
|
||||||
return material_service.create_material(payload, ctx).to_dict()
|
return _serialize_material(material_service.create_material(payload, ctx), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -107,12 +115,14 @@ def get_material(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
material_id: str,
|
material_id: str,
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_authenticated(ctx)
|
require_authenticated(ctx)
|
||||||
return material_service.get_material(material_id).to_dict()
|
return _serialize_material(material_service.get_material(material_id), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -122,12 +132,14 @@ def update_material(
|
||||||
material_id: str,
|
material_id: str,
|
||||||
payload: dict[str, Any],
|
payload: dict[str, Any],
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_permission(ctx, "can_manage_materials")
|
require_permission(ctx, "can_manage_materials")
|
||||||
return material_service.update_material(material_id, payload, ctx).to_dict()
|
return _serialize_material(material_service.update_material(material_id, payload, ctx), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -136,12 +148,14 @@ def delete_material(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
material_id: str,
|
material_id: str,
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_permission(ctx, "can_manage_materials")
|
require_permission(ctx, "can_manage_materials")
|
||||||
return material_service.delete_material(material_id, ctx).to_dict()
|
return _serialize_material(material_service.delete_material(material_id, ctx), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -150,12 +164,14 @@ def upload_material(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
payload: dict[str, Any],
|
payload: dict[str, Any],
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_permission(ctx, "can_manage_materials")
|
require_permission(ctx, "can_manage_materials")
|
||||||
return material_service.upload_material(payload, ctx).to_dict()
|
return _serialize_material(material_service.upload_material(payload, ctx), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -164,12 +180,14 @@ def recognize_material(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
material_id: str,
|
material_id: str,
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_permission(ctx, "can_manage_materials")
|
require_permission(ctx, "can_manage_materials")
|
||||||
return material_service.recognize_material(material_id, ctx).to_dict()
|
return _serialize_material(material_service.recognize_material(material_id, ctx), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -178,12 +196,14 @@ def re_recognize_material(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
material_id: str,
|
material_id: str,
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_permission(ctx, "can_manage_materials")
|
require_permission(ctx, "can_manage_materials")
|
||||||
return material_service.re_recognize_material(material_id, ctx).to_dict()
|
return _serialize_material(material_service.re_recognize_material(material_id, ctx), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -193,12 +213,14 @@ def confirm_material(
|
||||||
material_id: str,
|
material_id: str,
|
||||||
payload: dict[str, Any],
|
payload: dict[str, Any],
|
||||||
service: MaterialService | None = None,
|
service: MaterialService | None = None,
|
||||||
|
media_service: MediaService | None = None,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
material_service = service or _create_material_service()
|
material_service = service or _create_material_service()
|
||||||
|
signer = media_service or MediaService()
|
||||||
|
|
||||||
def action() -> dict[str, Any]:
|
def action() -> dict[str, Any]:
|
||||||
require_permission(ctx, "can_manage_materials")
|
require_permission(ctx, "can_manage_materials")
|
||||||
return material_service.confirm_material(material_id, payload, ctx).to_dict()
|
return _serialize_material(material_service.confirm_material(material_id, payload, ctx), signer)
|
||||||
|
|
||||||
return handle_request(ctx, action)
|
return handle_request(ctx, action)
|
||||||
|
|
||||||
|
|
@ -211,6 +233,28 @@ def _create_material_service() -> MaterialService:
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _serialize_material_list(result: MaterialListResult, media_service: MediaService) -> dict[str, Any]:
|
||||||
|
payload = result.to_dict()
|
||||||
|
payload["items"] = [_serialize_material(item, media_service) for item in result.items]
|
||||||
|
return payload
|
||||||
|
|
||||||
|
|
||||||
|
def _serialize_material(material: Material, media_service: MediaService) -> dict[str, Any]:
|
||||||
|
payload = material.to_dict()
|
||||||
|
payload["image_url"] = _signed_url(media_service, material.image_uri)
|
||||||
|
payload["thumbnail_url"] = _signed_url(media_service, material.thumbnail_uri)
|
||||||
|
return payload
|
||||||
|
|
||||||
|
|
||||||
|
def _signed_url(media_service: MediaService, uri: str | None) -> str | None:
|
||||||
|
if not uri:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
return media_service.sign_media(uri)["url"]
|
||||||
|
except ApiError:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def _optional_str(value: Any) -> str | None:
|
def _optional_str(value: Any) -> str | None:
|
||||||
if value is None:
|
if value is None:
|
||||||
return None
|
return None
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,10 @@ from backend.routes.material_routes import (
|
||||||
update_material,
|
update_material,
|
||||||
upload_material,
|
upload_material,
|
||||||
)
|
)
|
||||||
|
from backend.services.media_service import MediaService
|
||||||
from backend.services.material_service import MaterialService
|
from backend.services.material_service import MaterialService
|
||||||
from core.audit_service import AuditService
|
from core.audit_service import AuditService
|
||||||
|
from core.config_service import ConfigService
|
||||||
from core.identity import RequestContext
|
from core.identity import RequestContext
|
||||||
from database.db_helper import Database, DatabaseSettings, SqliteSettings
|
from database.db_helper import Database, DatabaseSettings, SqliteSettings
|
||||||
from database.repositories.material_repository import MaterialRepository
|
from database.repositories.material_repository import MaterialRepository
|
||||||
|
|
@ -27,12 +29,23 @@ from database.repositories.material_repository import MaterialRepository
|
||||||
class MaterialServiceTests(unittest.TestCase):
|
class MaterialServiceTests(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.tmp = tempfile.TemporaryDirectory()
|
self.tmp = tempfile.TemporaryDirectory()
|
||||||
|
self.root = Path(self.tmp.name)
|
||||||
|
self.config_path = self.root / "config.yaml"
|
||||||
|
(self.root / "materials").mkdir(parents=True, exist_ok=True)
|
||||||
|
self.config_path.write_text(
|
||||||
|
f"""
|
||||||
|
storage:
|
||||||
|
materials_path: "{(self.root / "materials").as_posix()}"
|
||||||
|
""",
|
||||||
|
encoding="utf-8",
|
||||||
|
)
|
||||||
self.database = Database(
|
self.database = Database(
|
||||||
DatabaseSettings(sqlite=SqliteSettings(path=str(Path(self.tmp.name) / "imagestudio.db")))
|
DatabaseSettings(sqlite=SqliteSettings(path=str(self.root / "imagestudio.db")))
|
||||||
)
|
)
|
||||||
self.database.initialize()
|
self.database.initialize()
|
||||||
self.audit_service = AuditService(self.database)
|
self.audit_service = AuditService(self.database)
|
||||||
self.material_service = MaterialService(MaterialRepository(self.database), self.audit_service)
|
self.material_service = MaterialService(MaterialRepository(self.database), self.audit_service)
|
||||||
|
self.media_service = MediaService(ConfigService(self.config_path))
|
||||||
self.ctx = RequestContext.from_astrbot(
|
self.ctx = RequestContext.from_astrbot(
|
||||||
username="admin",
|
username="admin",
|
||||||
user_id="user_001",
|
user_id="user_001",
|
||||||
|
|
@ -156,6 +169,7 @@ class MaterialServiceTests(unittest.TestCase):
|
||||||
self.assertTrue(categories["ok"])
|
self.assertTrue(categories["ok"])
|
||||||
self.assertEqual(len(categories["data"]), 1)
|
self.assertEqual(len(categories["data"]), 1)
|
||||||
|
|
||||||
|
(self.root / "materials" / "ribbon.png").write_bytes(b"ribbon")
|
||||||
material = create_material(
|
material = create_material(
|
||||||
self.ctx,
|
self.ctx,
|
||||||
{
|
{
|
||||||
|
|
@ -164,20 +178,26 @@ class MaterialServiceTests(unittest.TestCase):
|
||||||
"image_uri": "storage://materials/ribbon.png",
|
"image_uri": "storage://materials/ribbon.png",
|
||||||
},
|
},
|
||||||
self.material_service,
|
self.material_service,
|
||||||
|
self.media_service,
|
||||||
)
|
)
|
||||||
self.assertTrue(material["ok"])
|
self.assertTrue(material["ok"])
|
||||||
material_id = material["data"]["material_id"]
|
material_id = material["data"]["material_id"]
|
||||||
|
self.assertTrue(material["data"]["image_url"].startswith("/api/v1/plugins/extensions/"))
|
||||||
|
self.assertIsNone(material["data"]["thumbnail_url"])
|
||||||
|
self.assertNotIn(str(self.root), str(material["data"]))
|
||||||
|
|
||||||
detail = get_material(self.ctx, material_id, self.material_service)
|
detail = get_material(self.ctx, material_id, self.material_service, self.media_service)
|
||||||
self.assertTrue(detail["ok"])
|
self.assertTrue(detail["ok"])
|
||||||
|
self.assertTrue(detail["data"]["image_url"].startswith("/api/v1/plugins/extensions/"))
|
||||||
|
|
||||||
updated = update_material(self.ctx, material_id, {"recognition_status": "confirmed"}, self.material_service)
|
updated = update_material(self.ctx, material_id, {"recognition_status": "confirmed"}, self.material_service)
|
||||||
self.assertTrue(updated["ok"])
|
self.assertTrue(updated["ok"])
|
||||||
self.assertEqual(updated["data"]["recognition_status"], "confirmed")
|
self.assertEqual(updated["data"]["recognition_status"], "confirmed")
|
||||||
|
|
||||||
listed = list_materials(self.ctx, {"keyword": "ribbon"}, self.material_service)
|
listed = list_materials(self.ctx, {"keyword": "ribbon"}, self.material_service, self.media_service)
|
||||||
self.assertTrue(listed["ok"])
|
self.assertTrue(listed["ok"])
|
||||||
self.assertEqual(listed["data"]["total"], 1)
|
self.assertEqual(listed["data"]["total"], 1)
|
||||||
|
self.assertTrue(listed["data"]["items"][0]["image_url"].startswith("/api/v1/plugins/extensions/"))
|
||||||
|
|
||||||
read_only = RequestContext.from_astrbot(username="viewer", user_id="viewer_001")
|
read_only = RequestContext.from_astrbot(username="viewer", user_id="viewer_001")
|
||||||
denied = create_material(read_only, {"display_name": "Denied"}, self.material_service)
|
denied = create_material(read_only, {"display_name": "Denied"}, self.material_service)
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用