Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fix(retrieve): preserve rerank fallbacks for empty documents (#3231)

huangruitengba46491af0a7
diff --git a/openviking/retrieve/hierarchical_retriever.py b/openviking/retrieve/hierarchical_retriever.py
index de258bd51..011d51efa 100644
--- a/openviking/retrieve/hierarchical_retriever.py
+++ b/openviking/retrieve/hierarchical_retriever.py
@@ -346,23 +346,33 @@ class HierarchicalRetriever:
if not self._rerank_client or not documents:
return fallback_scores
+ rerank_documents = [
+ (index, document) for index, document in enumerate(documents) if document.strip()
+ ]
+ if not rerank_documents:
+ return fallback_scores
+
try:
- scores = await asyncio.to_thread(self._rerank_client.rerank_batch, query, documents)
+ scores = await asyncio.to_thread(
+ self._rerank_client.rerank_batch,
+ query,
+ [document for _, document in rerank_documents],
+ )
except Exception as e:
logger.warning(
"[HierarchicalRetriever] Rerank failed, fallback to vector scores: %s", e
)
return fallback_scores
- if not scores or len(scores) != len(documents):
+ if not scores or len(scores) != len(rerank_documents):
logger.warning(
"[HierarchicalRetriever] Invalid rerank result, fallback to vector scores"
)
return fallback_scores
- normalized_scores: List[float] = []
- for score, fallback in zip(scores, fallback_scores, strict=True):
- normalized_scores.append(self._finite_score(score, fallback))
+ normalized_scores = list(fallback_scores)
+ for score, (index, _) in zip(scores, rerank_documents, strict=True):
+ normalized_scores[index] = self._finite_score(score, fallback_scores[index])
return normalized_scores
async def _recursive_search(
diff --git a/tests/retrieve/test_hierarchical_retriever_rerank.py b/tests/retrieve/test_hierarchical_retriever_rerank.py
index 8494e6632..49c52356d 100644
--- a/tests/retrieve/test_hierarchical_retriever_rerank.py
+++ b/tests/retrieve/test_hierarchical_retriever_rerank.py
@@ -264,6 +264,30 @@ async def test_retrieve_uses_rerank_scores_in_thinking_mode(monkeypatch):
assert storage.search_calls[0]["level"] == [0, 1]
+async def test_rerank_scores_preserves_fallbacks_for_empty_documents(monkeypatch):
+ fake_client = FakeRerankClient([0.95, 0.05])
+ monkeypatch.setattr(
+ "openviking.retrieve.hierarchical_retriever.RerankClient.from_config",
+ lambda config: fake_client,
+ )
+
+ retriever = HierarchicalRetriever(
+ storage=DummyStorage(),
+ embedder=DummyEmbedder(),
+ rerank_config=_config(),
+ )
+
+ scores = await retriever._rerank_scores(
+ "hello",
+ ["root A", "", " ", "root D"],
+ [0.2, 0.8, 0.7, 0.4],
+ )
+
+ assert scores == [0.95, 0.8, 0.7, 0.05]
+ assert fake_client.calls == [("hello", ["root A", "root D"])]
+
+
@pytest.mark.asyncio
async def test_retrieve_falls_back_to_vector_scores_when_rerank_returns_none(monkeypatch):
class NoneRerankClient(FakeRerankClient):