Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

test(agent): verify package icon imports with SQLite (#44993)

Winorene5acabc3d529
diff --git a/api/tests/unit_tests/services/agent/test_package_resource_importer.py b/api/tests/unit_tests/services/agent/test_package_resource_importer.py
new file mode 100644
index 00000000000..c049b497ad6
--- /dev/null
+++ b/api/tests/unit_tests/services/agent/test_package_resource_importer.py
@@ -0,0 +1,133 @@
+"""Package icon imports persist destination-owned uploads in one transaction."""
+
+from __future__ import annotations
+
+import hashlib
+import io
+import zipfile
+from collections.abc import Callable, Iterator
+
+import pytest
+from PIL import Image
+from sqlalchemy import event, select
+from sqlalchemy.orm import Session, sessionmaker
+
+from extensions.storage.storage_type import StorageType
+from models.enums import CreatorUserRole
+from models.model import UploadFile
+from services.agent.errors import RosterAgentPackageResourceUnavailableError
+from services.agent.package_resource_importer import AgentPackageResourceImporter
+from services.agent.roster_package_entities import PackageIcon, PreparedPackageArchive, RosterAgentPackageMember
+
+
+class RecordingStorage:
+ def __init__(self, *, failure: Exception | None = None) -> None:
+ self.saved: list[tuple[str, bytes]] = []
+ self.failure = failure
+
+ def save(self, filename: str, data: bytes) -> None:
+ if self.failure is not None and len(self.saved) == 1:
+ raise self.failure
+ self.saved.append((filename, data))
+
+
+def packaged_icons(
+ config_overrides: Callable[..., None],
+) -> Iterator[tuple[PreparedPackageArchive, list[PackageIcon], dict[str, bytes]]]:
+ config_overrides(STORAGE_TYPE="local")
+ payloads: dict[str, bytes] = {}
+ icons: list[PackageIcon] = []
+ members: dict[str, RosterAgentPackageMember] = {}
+ archive = io.BytesIO()
+ with zipfile.ZipFile(archive, "w") as package:
+ for index, (extension, color) in enumerate([("png", "red"), ("jpg", "blue")], start=1):
+ image = io.BytesIO()
+ Image.new("RGB", (1, 1), color=color).save(image, format="PNG" if extension == "png" else "JPEG")
+ payload = image.getvalue()
+ icon_id = f"i_{index:06d}"
+ path = f"{icon_id}.{extension}"
+ digest = hashlib.sha256(payload).hexdigest()
+ package.writestr(path, payload)
+ payloads[path] = payload
+ members[path] = RosterAgentPackageMember(size=len(payload), sha256=digest)
+ icons.append(PackageIcon(id=icon_id, path=path, size=len(payload), sha256=digest))
+ with PreparedPackageArchive(archive=archive, members=members) as prepared:
+ yield prepared, icons, payloads
+
+
+def test_materialize_icons_commits_destination_owned_uploads(
+ packaged_icons: tuple[PreparedPackageArchive, list[PackageIcon], dict[str, bytes]],
+ sqlite_session_factory: sessionmaker[Session],
+) -> None:
+ archive, icons, payloads = packaged_icons
+ storage = RecordingStorage()
+
+ mapping = AgentPackageResourceImporter(storage_backend=storage).materialize_icons(
+ archive=archive, icons=icons, tenant_id="destination", account_id="importer"
+ )
+
+ with sqlite_session_factory() as session:
+ rows = {row.id: row for row in session.scalars(select(UploadFile))}
+ assert set(mapping) == {icon.id for icon in icons}
+ assert set(mapping.values()) == set(rows)
+ assert len(rows) == 2
+ for icon in icons:
+ row = rows[mapping[icon.id]]
+ payload = payloads[icon.path]
+ extension = icon.path.rsplit(".", 1)[1]
+ assert row.tenant_id == "destination"
+ assert row.created_by == "importer"
+ assert row.created_by_role == CreatorUserRole.ACCOUNT
+ assert row.storage_type == StorageType.LOCAL
+ assert row.name == icon.path
+ assert row.size == len(payload)
+ assert row.hash == hashlib.sha3_256(payload).hexdigest()
+ assert row.mime_type == ("image/png" if extension == "png" else "image/jpeg")
+ assert row.key == f"upload_files/destination/{row.id}.{extension}"
+ assert storage.saved == [(rows[mapping[icon.id]].key, payloads[icon.path]) for icon in icons]
+
+
+def test_materialize_icons_storage_failure_does_not_persist_partial_metadata(
+ packaged_icons: tuple[PreparedPackageArchive, list[PackageIcon], dict[str, bytes]],
+ sqlite_session_factory: sessionmaker[Session],
+) -> None:
+ archive, icons, _ = packaged_icons
+ error = OSError("storage unavailable")
+ storage = RecordingStorage(failure=error)
+
+ with pytest.raises(RosterAgentPackageResourceUnavailableError) as caught:
+ AgentPackageResourceImporter(storage_backend=storage).materialize_icons(
+ archive=archive, icons=icons, tenant_id="destination", account_id="importer"
+ )
+
+ assert caught.value.__cause__ is error
+ with sqlite_session_factory() as session:
+ assert list(session.scalars(select(UploadFile))) == []
+
+
+def test_materialize_icons_commit_failure_rolls_back_all_uploads(
+ packaged_icons: tuple[PreparedPackageArchive, list[PackageIcon], dict[str, bytes]],
+ sqlite_session_factory: sessionmaker[Session],
+) -> None:
+ archive, icons, _ = packaged_icons
+ storage = RecordingStorage()
+ error = RuntimeError("database commit failed")
+
+ def fail_commit(session: Session) -> None:
+ # Insert the rows in the real transaction before injecting the commit failure.
+ session.flush()
+ raise error
+
+ event.listen(sqlite_session_factory, "before_commit", fail_commit)
+ try:
+ with pytest.raises(RuntimeError) as caught:
+ AgentPackageResourceImporter(storage_backend=storage).materialize_icons(
+ archive=archive, icons=icons, tenant_id="destination", account_id="importer"
+ )
+ finally:
+ event.remove(sqlite_session_factory, "before_commit", fail_commit)
+
+ assert caught.value is error
+ with sqlite_session_factory() as session:
+ assert list(session.scalars(select(UploadFile))) == []
diff --git a/api/tests/unit_tests/services/test_app_package_service.py b/api/tests/unit_tests/services/test_app_package_service.py
index d8d68ff900f..1f4731581ba 100644
--- a/api/tests/unit_tests/services/test_app_package_service.py
+++ b/api/tests/unit_tests/services/test_app_package_service.py
@@ -7,7 +7,7 @@ import zipfile
from collections.abc import Callable, Generator, Mapping
from types import SimpleNamespace
from typing import cast
-from unittest.mock import MagicMock, Mock
+from unittest.mock import Mock
from uuid import uuid4
import pytest
@@ -40,7 +40,6 @@ from services.agent.errors import (
)
from services.agent.package_resource_exporter import AgentPackageResourceExporter, _FileSource, _SkillSource
from services.agent.package_resource_importer import AgentPackageResourceImporter
-from services.agent.roster_package_entities import PackageIcon, PreparedPackageArchive, RosterAgentPackageMember
from services.app_dsl_service import AppDslService, Import
from services.app_package_service import AppPackageManifest, AppPackageService
from services.dsl_content import DSL_MAX_SIZE
@@ -1228,35 +1227,6 @@ class TestPackageIconsCases:
with pytest.raises(RosterAgentPackageTooLargeError, match="image size"):
AppPackageService().read_package(_icon_archive())
- @staticmethod
- def test_materialized_icon_is_owned_by_destination(monkeypatch: pytest.MonkeyPatch) -> None:
- payload = b"image payload"
- digest = hashlib.sha256(payload).hexdigest()
- archive = io.BytesIO()
- with zipfile.ZipFile(archive, "w") as package:
- package.writestr("i_000001.png", payload)
- prepared = PreparedPackageArchive(
- archive=archive, members={"i_000001.png": RosterAgentPackageMember(size=len(payload), sha256=digest)}
- )
- icon = PackageIcon(id="i_000001", path="i_000001.png", size=len(payload), sha256=digest)
- session = MagicMock()
- monkeypatch.setattr(
- "services.agent.package_resource_importer.session_factory.create_session",
- MagicMock(return_value=session),
- )
- backend = Mock()
- with prepared:
- mapping = AgentPackageResourceImporter(storage_backend=backend).materialize_icons(
- archive=prepared, icons=[icon], tenant_id="destination", account_id="importer"
- )
- row = session.__enter__.return_value.add_all.call_args.args[0][0]
- assert row.id == mapping["i_000001"]
- assert row.tenant_id == "destination"
- assert row.created_by == "importer"
- assert row.mime_type == "image/png"
- assert row.key.startswith("upload_files/destination/")
- backend.save.assert_called_once_with(row.key, payload)
-
@staticmethod
def test_roster_export_embeds_agent_icon(monkeypatch: pytest.MonkeyPatch) -> None:
from models.agent_config_entities import AgentSoulConfig