RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(parser): propagate cancellation while waiting for vision figure futures (#17014)
iwasakib85efcf322b7
diff --git a/deepdoc/parser/figure_parser.py b/deepdoc/parser/figure_parser.pyindex dc17df438b..4806abb24a 100644--- a/deepdoc/parser/figure_parser.py+++ b/deepdoc/parser/figure_parser.py@@ -13,11 +13,13 @@# See the License for the specific language governing permissions and# limitations under the License.#-from concurrent.futures import ThreadPoolExecutor, as_completed+from concurrent.futures import ThreadPoolExecutor, wait, FIRST_COMPLETEDimport loggingfrom PIL import Image+from common.exceptions import TaskCanceledException+from common.constants import LLMTypefrom api.db.services.llm_service import LLMBundlefrom api.db.joint_services.tenant_model_service import get_tenant_default_model_by_type@@ -70,6 +72,8 @@ def vision_figure_parser_docx_wrapper(sections, tbls, callback=None, lang="Engli)boosted_figures = docx_vision_parser(callback=callback)tbls.extend(boosted_figures)+ except TaskCanceledException:+ raiseexcept Exception as e:callback(0.8, f"Visual model error: {e}. Skipping figure parsing enhancement.")return tbls@@ -109,6 +113,8 @@ def vision_figure_parser_figure_xlsx_wrapper(images, callback=None, lang="Engliscallback(0.22, "Parsing images...")boosted_figures = parser(callback=callback)tbls.extend(boosted_figures)+ except TaskCanceledException:+ raiseexcept Exception as e:callback(0.25, f"Excel visual model error: {e}. Skipping vision enhancement.")return tbls@@ -153,6 +159,8 @@ def vision_figure_parser_pdf_wrapper(tbls, callback=None, lang="English", **kwarboosted_figures = docx_vision_parser(callback=callback)tbls = [item for item in tbls if not is_figure_item(item)]tbls.extend(boosted_figures)+ except TaskCanceledException:+ raiseexcept Exception as e:callback(0.8, f"Visual model error: {e}. Skipping figure parsing enhancement.")return tbls@@ -204,12 +212,23 @@ def vision_figure_parser_docx_wrapper_naive(chunks, idx_lst, callback=None, langexcept Exception:pass- with ThreadPoolExecutor(max_workers=10) as executor:- futures = [executor.submit(worker, idx, chunks[idx]) for idx in idx_lst]-- for future in as_completed(futures):- idx, description = future.result()- chunks[idx]["text"] += description+ executor = ThreadPoolExecutor(max_workers=10)+ pending = {executor.submit(worker, idx, chunks[idx]) for idx in idx_lst}+ try:+ while pending:+ done, pending = wait(pending, timeout=1.0, return_when=FIRST_COMPLETED)+ for future in done:+ idx, description = future.result()+ chunks[idx]["text"] += description+ if callback:+ callback(0.75, "")+ except Exception:+ for f in pending:+ f.cancel()+ executor.shutdown(wait=False, cancel_futures=True)+ raise+ else:+ executor.shutdown(wait=True)shared_executor = ThreadPoolExecutor(max_workers=10)@@ -267,7 +286,7 @@ class VisionFigureParser:return self.assembleddef __call__(self, **kwargs):- callback = kwargs.get("callback", lambda prog, msg: None)+ callback = kwargs.get("callback") or (lambda prog, msg: None)@timeout(30, 3)def process(figure_idx, figure_binary):@@ -295,14 +314,19 @@ class VisionFigureParser:)return figure_idx, description_text- futures = []- for idx, img_binary in enumerate(self.figures or []):- futures.append(shared_executor.submit(process, idx, img_binary))-- for future in as_completed(futures):- figure_num, txt = future.result()- if txt:- self.descriptions[figure_num] = txt + "\n".join(self.descriptions[figure_num])+ pending = {shared_executor.submit(process, idx, img_binary) for idx, img_binary in enumerate(self.figures or [])}+ try:+ while pending:+ done, pending = wait(pending, timeout=1.0, return_when=FIRST_COMPLETED)+ for future in done:+ figure_num, txt = future.result()+ if txt:+ self.descriptions[figure_num] = txt + "\n".join(self.descriptions[figure_num])+ callback(0.75, "")+ except Exception:+ for f in pending:+ f.cancel()+ raiseself._assemble()