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: use real Redis clients in catalog fixtures (#43193)

Asuka Minato1b86126ab10b
diff --git a/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py b/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py
index 9b0e4db5b12..205f0bdf4e8 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_recommended_app_catalog_repository.py
@@ -1,6 +1,9 @@
-from unittest.mock import MagicMock, patch
+from collections.abc import Iterator
+from unittest.mock import patch
from uuid import uuid4
+import pytest
+from redis import Redis
from sqlalchemy.orm import Session, object_session, sessionmaker
from extensions.ext_redis import RedisClientWrapper
@@ -58,17 +61,23 @@ def _add_catalog_app(
return app
-def _repository(session: Session) -> DatabaseRecommendedAppCatalogRepository:
- redis = MagicMock(spec=RedisClientWrapper)
- redis.get.return_value = None
+def catalog_redis() -> Iterator[RedisClientWrapper]:
+ with Redis() as client, patch.object(client, "execute_command", return_value=None):
+ redis = RedisClientWrapper()
+ redis.initialize(client)
+ yield redis
+
+
+def _repository(session: Session, redis: RedisClientWrapper) -> DatabaseRecommendedAppCatalogRepository:
return DatabaseRecommendedAppCatalogRepository(
- sessionmaker(bind=session.get_bind(), expire_on_commit=False),
- redis=redis,
+ sessionmaker(bind=session.get_bind(), expire_on_commit=False), redis=redis
)
def test_list_maps_postgres_models_with_owned_session(
db_session_with_containers: Session,
+ catalog_redis: RedisClientWrapper,
) -> None:
app = _add_catalog_app(
db_session_with_containers,
@@ -77,7 +86,7 @@ def test_list_maps_postgres_models_with_owned_session(
private_app = _add_catalog_app(db_session_with_containers, is_public=False)
no_site_app = _add_catalog_app(db_session_with_containers, with_site=False)
- page = _repository(db_session_with_containers).list_recommended("fr-FR")
+ page = _repository(db_session_with_containers, catalog_redis).list_recommended("fr-FR")
record = next(item for item in page.recommended_apps if item.app_id == app.id)
assert record.app is not None
@@ -92,9 +101,10 @@ def test_list_maps_postgres_models_with_owned_session(
def test_membership_does_not_export_dsl_with_owned_session(
db_session_with_containers: Session,
+ catalog_redis: RedisClientWrapper,
) -> None:
app = _add_catalog_app(db_session_with_containers, with_site=False)
- repository = _repository(db_session_with_containers)
+ repository = _repository(db_session_with_containers, catalog_redis)
def export_dsl(*, app_model: App, session: Session) -> str:
assert object_session(app_model) is session
diff --git a/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.py b/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.py
index a90e21794ce..7da6834b3cf 100644
--- a/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.py
+++ b/api/tests/unit_tests/repositories/test_recommended_app_catalog_repository.py
@@ -72,6 +72,7 @@ def _add_catalog_app(
@pytest.mark.parametrize("unavailable", [None, "private", "unlisted", "unpublished", "foreign-snapshot", "archived"])
def test_agent_package_link_only_exposes_current_public_version(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_session_factory: sessionmaker[Session],
unavailable: str | None,
) -> None:
@@ -115,7 +116,7 @@ def test_agent_package_link_only_exposes_current_public_version(
entry.is_listed = False
session.commit()
- repository = _repository(sqlite_session_factory)
+ repository = _repository(sqlite_session_factory, redis=redis_transport[0])
source = repository.get_package_source(app.id, UUID(version_id))
detail = repository.get_detail(app.id)
assert repository.get_package_source(app.id, uuid4()) is None
@@ -131,30 +132,20 @@ def test_agent_package_link_only_exposes_current_public_version(
assert detail.version_id == version_id
-def _redis() -> MagicMock:
- redis = MagicMock(spec=RedisClientWrapper)
- redis.get.return_value = None
- return redis
-
-
def _repository(
- session_factory: sessionmaker[Session],
- *,
- redis: RedisClientWrapper | None = None,
+ session_factory: sessionmaker[Session], *, redis: RedisClientWrapper
) -> DatabaseRecommendedAppCatalogRepository:
- return DatabaseRecommendedAppCatalogRepository(
- session_factory,
- redis=redis if redis is not None else _redis(),
- )
+ return DatabaseRecommendedAppCatalogRepository(session_factory, redis=redis)
def test_list_recommended_returns_typed_records_and_falls_back_language(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_session_factory: sessionmaker[Session],
) -> None:
with sqlite_session_factory() as session:
app = _add_catalog_app(session)
- repository = _repository(sqlite_session_factory)
+ repository = _repository(sqlite_session_factory, redis=redis_transport[0])
page = repository.list_recommended("fr-FR")
assert page.categories == ("Workflow",)
@@ -170,6 +161,7 @@ def test_list_recommended_returns_typed_records_and_falls_back_language(
def test_list_recommended_batches_app_and_site_lookups(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_engine: Engine,
sqlite_session_factory: sessionmaker[Session],
) -> None:
@@ -185,7 +177,7 @@ def test_list_recommended_batches_app_and_site_lookups(
event.listen(sqlite_engine, "before_cursor_execute", count_selects)
try:
- page = _repository(sqlite_session_factory).list_recommended("en-US")
+ page = _repository(sqlite_session_factory, redis=redis_transport[0]).list_recommended("en-US")
finally:
event.remove(sqlite_engine, "before_cursor_execute", count_selects)
@@ -194,24 +186,26 @@ def test_list_recommended_batches_app_and_site_lookups(
def test_list_recommended_skips_private_apps_and_apps_without_sites(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_session_factory: sessionmaker[Session],
) -> None:
with sqlite_session_factory() as session:
_add_catalog_app(session, is_public=False)
_add_catalog_app(session, with_site=False)
- repository = _repository(sqlite_session_factory)
+ repository = _repository(sqlite_session_factory, redis=redis_transport[0])
assert repository.list_recommended("en-US").recommended_apps == ()
def test_list_recommended_does_not_restore_legacy_category_when_categories_are_empty(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_session_factory: sessionmaker[Session],
) -> None:
with sqlite_session_factory() as session:
app = _add_catalog_app(session, categories=[])
- page = _repository(sqlite_session_factory).list_recommended("en-US")
+ page = _repository(sqlite_session_factory, redis=redis_transport[0]).list_recommended("en-US")
record = next(item for item in page.recommended_apps if item.app_id == app.id)
assert record.categories == ()
@@ -219,6 +213,7 @@ def test_list_recommended_does_not_restore_legacy_category_when_categories_are_e
def test_list_recommended_uses_redis_category_order(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_engine: Engine,
sqlite_session_factory: sessionmaker[Session],
) -> None:
@@ -235,12 +230,12 @@ def test_list_recommended_uses_redis_category_order(
nonlocal checked_out_connections
checked_out_connections -= 1
- def get_category_order(_key: str) -> bytes:
+ def get_category_order(_command: str, _key: str, **_kwargs: object) -> bytes:
assert checked_out_connections == 0
return json.dumps(["C", "A", "B"]).encode()
- redis = _redis()
- redis.get.side_effect = get_category_order
+ redis, commands = redis_transport
+ commands.side_effect = get_category_order
event.listen(sqlite_engine, "checkout", record_checkout)
event.listen(sqlite_engine, "checkin", record_checkin)
try:
@@ -250,13 +245,16 @@ def test_list_recommended_uses_redis_category_order(
event.remove(sqlite_engine, "checkin", record_checkin)
assert page.categories == ("C", "A", "B")
- redis.get.assert_called_once_with("explore:apps:category_order:en-US")
+ commands.assert_called_once_with(
+ "GET", "explore:apps:category_order:en-US", keys=["explore:apps:category_order:en-US"]
+ )
def test_list_recommended_sorts_categories_without_redis_order(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_session_factory: sessionmaker[Session],
) -> None:
- redis = _redis()
+ redis, commands = redis_transport
with sqlite_session_factory() as session:
_add_catalog_app(session, categories=["B", "A", "C"])
@@ -266,29 +264,31 @@ def test_list_recommended_sorts_categories_without_redis_order(
def test_list_learn_dify_filters_flag_and_hides_page_categories(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_session_factory: sessionmaker[Session],
) -> None:
with sqlite_session_factory() as session:
learn_app = _add_catalog_app(session, is_learn_dify=True)
_add_catalog_app(session, is_learn_dify=False)
- redis = _redis()
+ redis, commands = redis_transport
repository = _repository(sqlite_session_factory, redis=redis)
page = repository.list_learn_dify("fr-FR")
assert [app.app_id for app in page.recommended_apps] == [learn_app.id]
assert page.recommended_apps[0].categories == ("Workflow",)
assert page.categories == ()
- redis.get.assert_not_called()
+ commands.assert_not_called()
def test_membership_does_not_export_dsl(
+ redis_transport: tuple[RedisClientWrapper, MagicMock],
sqlite_session_factory: sessionmaker[Session],
) -> None:
with sqlite_session_factory() as session:
app = _add_catalog_app(session)
- repository = _repository(sqlite_session_factory)
+ repository = _repository(sqlite_session_factory, redis=redis_transport[0])
with patch(
"repositories.recommended_app_catalog_repository.AppDslService.export_dsl",
return_value="exported yaml",
@@ -308,13 +308,15 @@ def test_membership_does_not_export_dsl(
export_dsl.assert_called_once()
-def test_detail_rejects_unlisted_or_private_apps(sqlite_session_factory: sessionmaker[Session]) -> None:
+def test_detail_rejects_unlisted_or_private_apps(
+ redis_transport: tuple[RedisClientWrapper, MagicMock], sqlite_session_factory: sessionmaker[Session]
+) -> None:
with sqlite_session_factory() as session:
private_app = _add_catalog_app(session, is_public=False)
unlisted_app = _add_catalog_app(session, is_listed=False)
missing_app_id = str(uuid4())
- repository = _repository(sqlite_session_factory)
+ repository = _repository(sqlite_session_factory, redis=redis_transport[0])
assert repository.get_detail(private_app.id) is None
assert repository.get_detail(unlisted_app.id) is None
@@ -324,11 +326,13 @@ def test_detail_rejects_unlisted_or_private_apps(sqlite_session_factory: session
assert repository.contains(missing_app_id) is False
-def test_detail_does_not_require_site(sqlite_session_factory: sessionmaker[Session]) -> None:
+def test_detail_does_not_require_site(
+ redis_transport: tuple[RedisClientWrapper, MagicMock], sqlite_session_factory: sessionmaker[Session]
+) -> None:
with sqlite_session_factory() as session:
app = _add_catalog_app(session, with_site=False)
- repository = _repository(sqlite_session_factory)
+ repository = _repository(sqlite_session_factory, redis=redis_transport[0])
with patch(
"repositories.recommended_app_catalog_repository.AppDslService.export_dsl",
return_value="exported yaml",