yujunjun/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2025-06-26 22:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize Tag Removal Method (#7847)

Browse Source 
### What problem does this PR solve?

_Briefly describe what this PR aims to solve. Include background context
that will help reviewers understand the purpose of the PR._

### Type of change

- [ ] Bug Fix (non-breaking change which fixes an issue)
- [ ] New Feature (non-breaking change which adds functionality)
- [ ] Documentation Update
- [x] Refactoring
- [ ] Performance Improvement
- [ ] Other (please describe):
This commit is contained in:
LUO huan huan 2025-05-26 16:56:33 +08:00 committed by GitHub
parent 78fa37f8ae
commit c7db0eaca6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
agentic_reasoning/deep_research.py
View File

@ -36,17 +36,20 @@ class DeepResearcher:
self._kb_retrieve = kb_retrieve self._kb_retrieve = kb_retrieve
self._kg_retrieve = kg_retrieve self._kg_retrieve = kg_retrieve
@staticmethod def _remove_tags(text: str, start_tag: str, end_tag: str) -> str:
def _remove_query_tags(text): """General Tag Removal Method"""
"""Remove query tags from text""" pattern = re.escape(start_tag) + r"(.*?)" + re.escape(end_tag)
pattern = re.escape(BEGIN_SEARCH_QUERY) + r"(.*?)" + re.escape(END_SEARCH_QUERY)
return re.sub(pattern, "", text) return re.sub(pattern, "", text)
@staticmethod @staticmethod
def _remove_result_tags(text): def _remove_query_tags(text: str) -> str:
"""Remove result tags from text""" """Remove Query Tags"""
pattern = re.escape(BEGIN_SEARCH_RESULT) + r"(.*?)" + re.escape(END_SEARCH_RESULT) return DeepResearcher._remove_tags(text, BEGIN_SEARCH_QUERY, END_SEARCH_QUERY)
return re.sub(pattern, "", text)
@staticmethod
def _remove_result_tags(text: str) -> str:
"""Remove Result Tags"""
return DeepResearcher._remove_tags(text, BEGIN_SEARCH_RESULT, END_SEARCH_RESULT)
def _generate_reasoning(self, msg_history): def _generate_reasoning(self, msg_history):
"""Generate reasoning steps""" """Generate reasoning steps"""
@ -95,20 +98,30 @@ class DeepResearcher:
def _retrieve_information(self, search_query): def _retrieve_information(self, search_query):
"""Retrieve information from different sources""" """Retrieve information from different sources"""
# 1. Knowledge base retrieval # 1. Knowledge base retrieval
kbinfos = []
try:
kbinfos = self._kb_retrieve(question=search_query) if self._kb_retrieve else {"chunks": [], "doc_aggs": []} kbinfos = self._kb_retrieve(question=search_query) if self._kb_retrieve else {"chunks": [], "doc_aggs": []}
except Exception as e:
logging.error(f"Knowledge base retrieval error: {e}")
# 2. Web retrieval (if Tavily API is configured) # 2. Web retrieval (if Tavily API is configured)
try:
if self.prompt_config.get("tavily_api_key"): if self.prompt_config.get("tavily_api_key"):
tav = Tavily(self.prompt_config["tavily_api_key"]) tav = Tavily(self.prompt_config["tavily_api_key"])
tav_res = tav.retrieve_chunks(search_query) tav_res = tav.retrieve_chunks(search_query)
kbinfos["chunks"].extend(tav_res["chunks"]) kbinfos["chunks"].extend(tav_res["chunks"])
kbinfos["doc_aggs"].extend(tav_res["doc_aggs"]) kbinfos["doc_aggs"].extend(tav_res["doc_aggs"])
except Exception as e:
logging.error(f"Web retrieval error: {e}")
# 3. Knowledge graph retrieval (if configured) # 3. Knowledge graph retrieval (if configured)
try:
if self.prompt_config.get("use_kg") and self._kg_retrieve: if self.prompt_config.get("use_kg") and self._kg_retrieve:
ck = self._kg_retrieve(question=search_query) ck = self._kg_retrieve(question=search_query)
if ck["content_with_weight"]: if ck["content_with_weight"]:
kbinfos["chunks"].insert(0, ck) kbinfos["chunks"].insert(0, ck)
except Exception as e:
logging.error(f"Knowledge graph retrieval error: {e}")
return kbinfos return kbinfos