Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix(mcp): bound metadata cache and prevent partial pagination caching (#19138)

Sbaaoui Idriss69fd509cee3f
diff --git a/mcp/server/server.py b/mcp/server/server.py
index d9453f58f1..801b42cb2b 100644
--- a/mcp/server/server.py
+++ b/mcp/server/server.py
@@ -123,11 +123,14 @@ class RAGFlowConnector:
if self._is_cache_valid(ts):
self._document_metadata_cache.move_to_end(dataset_id)
return {doc_id: doc_meta for doc_id, doc_meta in data_list}
+ del self._document_metadata_cache[dataset_id]
return None
def _set_cached_document_metadata_by_dataset(self, dataset_id, doc_id_meta_list):
self._document_metadata_cache[dataset_id] = (doc_id_meta_list, self._get_expiry_timestamp())
self._document_metadata_cache.move_to_end(dataset_id)
+ if len(self._document_metadata_cache) > self._MAX_DATASET_CACHE:
+ self._document_metadata_cache.popitem(last=False)
async def _fetch_datasets_page(
self,
@@ -364,14 +367,15 @@ class RAGFlowConnector:
page_size = 30
doc_id_meta_list = []
docs = {}
+ pagination_succeeded = True
while True:
docs_res = await self._get(f"/datasets/{dataset_id}/documents?page={page}&page_size={page_size}", api_key=api_key)
- if not docs_res:
- # Transport-level failure: stop without caching a partial result.
+ if not docs_res or docs_res.status_code != 200:
+ pagination_succeeded = False
break
docs_data = docs_res.json()
if docs_data.get("code") != 0:
- # API error: stop instead of re-requesting the same page forever.
+ pagination_succeeded = False
break
page_docs = docs_data.get("data", {}).get("docs") or []
for doc in page_docs:
@@ -395,8 +399,6 @@ class RAGFlowConnector:
doc_id_meta_list.append((doc_id, doc_meta))
docs[doc_id] = doc_meta
- self._set_cached_document_metadata_by_dataset(dataset_id, doc_id_meta_list)
-
# A page smaller than page_size (including an empty one) is the
# last page. This terminates empty/exhausted result sets, which
# previously looped forever re-requesting the same page (#16248),
@@ -405,6 +407,10 @@ class RAGFlowConnector:
if len(page_docs) < page_size:
break
page += 1
+ if pagination_succeeded:
+ self._set_cached_document_metadata_by_dataset(dataset_id, doc_id_meta_list)
+ else:
+ docs = {}
if docs:
document_cache.update(docs)