opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-08-28 19:38:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): preserve remote catalog detail misses

Browse Source
This commit is contained in:
hjlarry 2026-08-14 22:01:40 +08:00
parent accb6dba8d
commit 629ecf510e
2 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/services/recommended_app_catalog_gateway.py
View File

@ -134,13 +134,10 @@ class RemoteRecommendedAppCatalogGateway(RecommendedAppCatalogQuery):
def _fetch_detail(self, app_id: str) -> object | None:
status_code, detail = self._get_payload(f"/apps/{app_id}")
if status_code == 404:
# The remote catalog uses 404 for an authoritative miss: the app is
# absent, unlisted, or not visible to the current Origin. Do not
# revive it from the bundled fallback.
return None
if status_code != 200:
raise ValueError(f"fetch recommended app detail failed, status code: {status_code}")
# Preserve the legacy detail contract: only request or decoding
# failures use the bundled fallback; HTTP responses are authoritative.
return None
return detail
def _fetch_page(self, language: str) -> object:

43
api/tests/unit_tests/services/test_recommended_app_catalog_gateway.py
View File

@ -328,9 +328,11 @@ class TestRemoteRecommendedAppCatalogGateway:
)
database.list_learn_dify.assert_not_called()
def test_detail_404_returns_none_without_builtin_fallback(
@pytest.mark.parametrize("status_code", [404, 500])
def test_detail_non_200_returns_none_without_builtin_fallback(
self,
monkeypatch: pytest.MonkeyPatch,
status_code: int,
) -> None:
fallback = MagicMock()
remote = RemoteRecommendedAppCatalogGateway()
@ -339,35 +341,12 @@ class TestRemoteRecommendedAppCatalogGateway:
database=MagicMock(),
builtin=fallback,
)
response = MagicMock(status_code=404)
response = MagicMock(status_code=status_code)
monkeypatch.setattr("services.recommended_app_catalog_gateway.httpx.get", MagicMock(return_value=response))
assert router.get_detail("missing") is None
fallback.get_detail.assert_not_called()
def test_detail_server_error_falls_back_to_builtin(self, monkeypatch: pytest.MonkeyPatch) -> None:
fallback = MagicMock()
fallback_detail = RecommendedAppDetailRecord(
id="fallback",
name="Fallback",
icon=None,
icon_background=None,
mode="chat",
export_data="{}",
)
fallback.get_detail.return_value = fallback_detail
remote = RemoteRecommendedAppCatalogGateway()
router = RecommendedAppCatalogRouter(
remote=remote,
database=MagicMock(),
builtin=fallback,
)
response = MagicMock(status_code=500)
monkeypatch.setattr(gateway_module.httpx, "get", MagicMock(return_value=response))
assert router.get_detail("app-1") == fallback_detail
fallback.get_detail.assert_called_once_with("app-1")
def test_detail_fetch_error_falls_back_to_builtin(self, monkeypatch: pytest.MonkeyPatch) -> None:
fallback = MagicMock()
fallback_detail = RecommendedAppDetailRecord(
@ -425,7 +404,12 @@ class TestRemoteRecommendedAppCatalogGateway:
assert gateway.contains("app-1") is True
def test_membership_none_does_not_fall_back(self, monkeypatch: pytest.MonkeyPatch) -> None:
@pytest.mark.parametrize("status_code", [404, 500])
def test_membership_non_200_does_not_fall_back(
self,
monkeypatch: pytest.MonkeyPatch,
status_code: int,
) -> None:
fallback = MagicMock()
remote = RemoteRecommendedAppCatalogGateway()
router = RecommendedAppCatalogRouter(
@ -433,13 +417,13 @@ class TestRemoteRecommendedAppCatalogGateway:
database=MagicMock(),
builtin=fallback,
)
response = MagicMock(status_code=404)
response = MagicMock(status_code=status_code)
monkeypatch.setattr(gateway_module.httpx, "get", MagicMock(return_value=response))
assert router.contains("missing") is False
fallback.contains.assert_not_called()
def test_membership_server_error_falls_back_to_builtin(self, monkeypatch: pytest.MonkeyPatch) -> None:
def test_membership_fetch_error_falls_back_to_builtin(self, monkeypatch: pytest.MonkeyPatch) -> None:
fallback = MagicMock()
fallback.contains.return_value = True
remote = RemoteRecommendedAppCatalogGateway()
@ -448,8 +432,7 @@ class TestRemoteRecommendedAppCatalogGateway:
database=MagicMock(),
builtin=fallback,
)
response = MagicMock(status_code=500)
monkeypatch.setattr(gateway_module.httpx, "get", MagicMock(return_value=response))
monkeypatch.setattr(remote, "_fetch_detail", MagicMock(side_effect=ConnectionError("timeout")))
assert router.contains("app-1") is True
fallback.contains.assert_called_once_with("app-1")