youngkingdom/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-03-18 13:20:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Limit max recursion depth for rag analyzer#3318 (#13637)

Browse Source 
### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Yingfeng
2026-03-16 22:49:56 +08:00
committed by GitHub
parent 5403f142ae
commit 73bc9b91de
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/cpp/rag_analyzer.cpp
View File

@ -964,15 +964,33 @@ std::pair<std::vector<std::string>, double> RAGAnalyzer::MaxBackward(const std::
return Score(res);
}
static constexpr int MAX_DFS_DEPTH = 10;
int RAGAnalyzer::DFS(const std::string &chars,
const int s,
std::vector<std::pair<std::string, int>> &pre_tokens,
std::vector<std::vector<std::pair<std::string, int>>> &token_list,
std::vector<std::string> &best_tokens,
double &max_score,
const bool memo_all) const {
const bool memo_all,
const int depth) const {
int res = s;
const int len = UTF8Length(chars);
// Check max recursion depth - graceful degradation like Python version
if (depth > MAX_DFS_DEPTH) {
if (s < len) {
auto pretks = pre_tokens;
std::string remaining = UTF8Substr(chars, s, len - s);
pretks.emplace_back(std::move(remaining), Encode(-12, 0));
if (memo_all) {
token_list.push_back(std::move(pretks));
} else if (auto [vec_str, current_score] = Score(pretks); current_score > max_score) {
best_tokens = std::move(vec_str);
max_score = current_score;
}
}
return len;
}
if (s >= len) {
if (memo_all) {
token_list.push_back(pre_tokens);
@ -1011,7 +1029,7 @@ int RAGAnalyzer::DFS(const std::string &chars,
if (const int v = trie_->Get(k); v != -1) {
auto pretks = pre_tokens;
pretks.emplace_back(std::move(t), v);
res = std::max(res, DFS(chars, e, pretks, token_list, best_tokens, max_score, memo_all));
res = std::max(res, DFS(chars, e, pretks, token_list, best_tokens, max_score, memo_all, depth + 1));
}
}
@ -1026,7 +1044,7 @@ int RAGAnalyzer::DFS(const std::string &chars,
pre_tokens.emplace_back(std::move(t), Encode(-12, 0));
}
return DFS(chars, s + 1, pre_tokens, token_list, best_tokens, max_score, memo_all);
return DFS(chars, s + 1, pre_tokens, token_list, best_tokens, max_score, memo_all, depth + 1);
}
struct TokensList {

3
internal/cpp/rag_analyzer.h
View File

@ -121,7 +121,8 @@ private:
std::vector<std::vector<std::pair<std::string, int>>>& token_list,
std::vector<std::string>& best_tokens,
double& max_score,
bool memo_all) const;
bool memo_all,
int depth = 0) const;
void TokenizeInner(std::vector<std::string>& res, const std::string& L) const;