python/ai-business-write
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增强文档生成和处理逻辑，兼容文件信息字段，改进错误处理机制，确保在处理段落和表格时的稳定性和详细错误记录。

Browse Source
This commit is contained in:
python 2025-12-11 09:41:31 +08:00
parent 4897c96b05
commit 6c31137cf4
2 changed files with 79 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app.py
View File

@ -651,11 +651,12 @@ def generate_document():
first_document_name = None # 用于存储第一个生成的文档名 first_document_name = None # 用于存储第一个生成的文档名
for file_info in file_list: for file_info in file_list:
file_id = file_info.get('fileId') # 兼容 id 和 fileId 两种字段
file_name = file_info.get('fileName', '') file_id = file_info.get('fileId') or file_info.get('id')
file_name = file_info.get('fileName') or file_info.get('name', '')
if not file_id: if not file_id:
return error_response(1001, f"文件 {file_name} 缺少fileId参数") return error_response(1001, f"文件 {file_name} 缺少fileId或id参数")
try: try:
# 生成文档（使用fileId而不是templateCode） # 生成文档（使用fileId而不是templateCode）
@ -778,11 +779,12 @@ def get_document_by_task():
first_document_name = None # 用于存储第一个生成的文档名 first_document_name = None # 用于存储第一个生成的文档名
for file_info in file_list: for file_info in file_list:
file_id = file_info.get('fileId') # 兼容 id 和 fileId 两种字段
file_name = file_info.get('fileName', '') file_id = file_info.get('fileId') or file_info.get('id')
file_name = file_info.get('fileName') or file_info.get('name', '')
if not file_id: if not file_id:
return error_response(1001, f"文件 {file_name} 缺少fileId参数") return error_response(1001, f"文件 {file_name} 缺少fileId或id参数")
try: try:
# 生成文档（使用fileId而不是templateCode） # 生成文档（使用fileId而不是templateCode）

95
services/document_service.py
View File

@ -136,41 +136,74 @@ class DocumentService:
def replace_placeholder_in_paragraph(paragraph): def replace_placeholder_in_paragraph(paragraph):
"""在段落中替换占位符（处理跨run的情况）""" """在段落中替换占位符（处理跨run的情况）"""
# 获取段落完整文本 try:
full_text = paragraph.text # 获取段落完整文本
if not full_text: full_text = paragraph.text
return if not full_text:
return
# 检查是否有占位符需要替换 # 检查是否有占位符需要替换
has_placeholder = False has_placeholder = False
replaced_text = full_text replaced_text = full_text
for field_code, field_value in field_data.items(): for field_code, field_value in field_data.items():
placeholder = f"{{{{{field_code}}}}}" placeholder = f"{{{{{field_code}}}}}"
if placeholder in replaced_text: if placeholder in replaced_text:
has_placeholder = True has_placeholder = True
replaced_text = replaced_text.replace(placeholder, field_value or '') replaced_text = replaced_text.replace(placeholder, field_value or '')
# 如果有替换，更新段落文本 # 如果有替换，使用安全的方式更新段落文本
if has_placeholder: if has_placeholder:
# 清空所有run try:
paragraph.clear() # 方法1：直接设置text（推荐，会自动处理run）
# 添加新的run并设置替换后的文本 paragraph.text = replaced_text
if replaced_text: except Exception as e1:
paragraph.add_run(replaced_text) # 如果方法1失败，尝试方法2：手动处理run
try:
# 清空所有run
paragraph.clear()
# 添加新的run
if replaced_text:
paragraph.add_run(replaced_text)
except Exception as e2:
# 如果两种方法都失败，记录错误但继续
print(f"[WARN] 无法更新段落文本，方法1错误: {str(e1)}, 方法2错误: {str(e2)}")
pass
except Exception as e:
# 如果单个段落处理失败，记录错误但继续处理其他段落
print(f"[WARN] 处理段落时出错: {str(e)}")
import traceback
print(traceback.format_exc())
pass
# 替换段落中的占位符 # 替换段落中的占位符
for paragraph in doc.paragraphs: for paragraph in doc.paragraphs:
replace_placeholder_in_paragraph(paragraph) replace_placeholder_in_paragraph(paragraph)
# 替换表格中的占位符 # 替换表格中的占位符
for table in doc.tables: try:
for row in table.rows: for table in doc.tables:
for cell in row.cells: if not table.rows:
# 检查cell是否有paragraphs属性且不为空 continue
if hasattr(cell, 'paragraphs') and cell.paragraphs: for row in table.rows:
for paragraph in cell.paragraphs: if not row.cells:
replace_placeholder_in_paragraph(paragraph) continue
for cell in row.cells:
try:
# 检查cell是否有paragraphs属性且不为空
if hasattr(cell, 'paragraphs'):
# 安全地获取paragraphs列表
paragraphs = list(cell.paragraphs) if cell.paragraphs else []
for paragraph in paragraphs:
replace_placeholder_in_paragraph(paragraph)
except Exception as e:
# 如果单个单元格处理失败，记录错误但继续处理其他单元格
print(f"[WARN] 处理表格单元格时出错: {str(e)}")
pass
except Exception as e:
# 如果表格处理失败，记录错误但继续保存文档
print(f"[WARN] 处理表格时出错: {str(e)}")
pass
# 保存到临时文件 # 保存到临时文件
temp_dir = tempfile.gettempdir() temp_dir = tempfile.gettempdir()
@ -179,8 +212,16 @@ class DocumentService:
return output_file return output_file
except IndexError as e:
# 索引越界错误，提供更详细的错误信息
import traceback
error_detail = traceback.format_exc()
raise Exception(f"填充模板失败: list index out of range. 详细信息: {str(e)}\n{error_detail}")
except Exception as e: except Exception as e:
raise Exception(f"填充模板失败: {str(e)}") # 其他错误，提供详细的错误信息
import traceback
error_detail = traceback.format_exc()
raise Exception(f"填充模板失败: {str(e)}\n{error_detail}")
def upload_to_minio(self, file_path: str, file_name: str) -> str: def upload_to_minio(self, file_path: str, file_name: str) -> str:
""" """