refactor: 完善降级链的异常捕获机制
为所有 Reader 的 parser 循环添加 try-except 防护层,确保即使 parser 抛出意外异常,降级链也能继续尝试下一个 parser。 主要变更: - 所有 Reader (DocxReader/PdfReader/XlsxReader/PptxReader/HtmlReader) 的 parse 方法中添加防护层,捕获意外异常并标记为 [意外异常] - cleaner.clean_html_content() 添加异常处理,返回 (content, error) 元组 - HtmlReader.parse() 更新 cleaner 调用方式,处理新的返回值格式 - BaseReader 添加详细的异常处理规范文档 设计原则:双层异常保护 - Parser 层:捕获预期的解析失败(库未安装、格式不支持) - Reader 层:捕获意外的编程错误(NoneType、索引越界等)
This commit is contained in:
@@ -50,7 +50,11 @@ class HtmlReader(BaseReader):
|
||||
return None, [f"- {error}"]
|
||||
|
||||
# 步骤 2: 清理 HTML 内容
|
||||
html_content = cleaner.clean_html_content(html_content)
|
||||
cleaned_html, error = cleaner.clean_html_content(html_content)
|
||||
if error:
|
||||
all_failures.append(f"- cleaner: {error}")
|
||||
return None, all_failures
|
||||
html_content = cleaned_html
|
||||
|
||||
# 步骤 3: 对每个 Parser 创建独立的临时文件并尝试解析
|
||||
for parser_name, parser_func in PARSERS:
|
||||
@@ -61,12 +65,15 @@ class HtmlReader(BaseReader):
|
||||
with os.fdopen(fd, 'w', encoding='utf-8') as f:
|
||||
f.write(html_content)
|
||||
|
||||
# 调用 Parser 解析
|
||||
content, error = parser_func(temp_file_path)
|
||||
if content is not None:
|
||||
return content, all_failures
|
||||
else:
|
||||
all_failures.append(f"- {parser_name}: {error}")
|
||||
# 调用 Parser 解析(添加防护层)
|
||||
try:
|
||||
content, error = parser_func(temp_file_path)
|
||||
if content is not None:
|
||||
return content, all_failures
|
||||
else:
|
||||
all_failures.append(f"- {parser_name}: {error}")
|
||||
except Exception as e:
|
||||
all_failures.append(f"- {parser_name}: [意外异常] {type(e).__name__}: {str(e)}")
|
||||
finally:
|
||||
# 清理临时文件
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user