|
|
@@ -12,12 +12,12 @@ import time
|
|
|
import random
|
|
|
from pathlib import Path
|
|
|
from typing import Dict, Any, Optional, List, Tuple
|
|
|
-import ast
|
|
|
import re
|
|
|
|
|
|
from ..utils.logging_config import get_logger
|
|
|
from ..config import (
|
|
|
PADDLEOCR_CMD as _PADDLEOCR_CMD,
|
|
|
+ PADDLEOCR_PYTHON_PATH as _PADDLEOCR_PYTHON_PATH,
|
|
|
PADDLE_OCR_DEVICE as _PADDLE_OCR_DEVICE,
|
|
|
PADDLE_OCR_DEVICES as _PADDLE_OCR_DEVICES_CONFIG,
|
|
|
VL_REC_BACKEND,
|
|
|
@@ -390,7 +390,6 @@ def _call_paddleocr_cli(
|
|
|
|
|
|
# PaddleOCR CLI 会在 save_path 下创建目录,然后在目录里生成 markdown 文件
|
|
|
# 递归查找所有 .md 文件
|
|
|
- from pathlib import Path
|
|
|
save_path_obj = Path(save_path)
|
|
|
if save_path_obj.exists():
|
|
|
md_files = list(save_path_obj.rglob("*.md"))
|
|
|
@@ -428,9 +427,13 @@ def _call_paddleocr_wrapper(
|
|
|
logger.error(f"[PaddleOCR Wrapper] 脚本不存在: {wrapper_script}")
|
|
|
return False, None
|
|
|
|
|
|
- # 获取 Python 解释器路径(使用 PaddleOCR 虚拟环境)
|
|
|
- python_executable = "/mnt/win_d/paddle/.venv_paddleocr/bin/python"
|
|
|
- if not os.path.exists(python_executable):
|
|
|
+ # 获取 Python 解释器路径
|
|
|
+ # 优先使用配置的路径,否则使用当前 Python 解释器
|
|
|
+ python_executable = _PADDLEOCR_PYTHON_PATH.strip() if _PADDLEOCR_PYTHON_PATH else ""
|
|
|
+ if python_executable and not os.path.exists(python_executable):
|
|
|
+ logger.warning(f"[PaddleOCR Wrapper] 配置的 Python 路径不存在: {python_executable},使用当前解释器")
|
|
|
+ python_executable = ""
|
|
|
+ if not python_executable:
|
|
|
python_executable = sys.executable
|
|
|
|
|
|
# 构建命令
|