From 9c08223154c5cb82a53313f8dd1ff5a8e34bc16e Mon Sep 17 00:00:00 2001 From: liurui Date: Thu, 10 Sep 2026 15:23:38 +0800 Subject: [PATCH 1/2] refactor(render): add structured render result channel --- fastcdm/core.py | 14 ++++++++++---- fastcdm/render/render_worker.py | 23 +++++++++++++++++------ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/fastcdm/core.py b/fastcdm/core.py index f986084..7c1d56b 100644 --- a/fastcdm/core.py +++ b/fastcdm/core.py @@ -1,4 +1,4 @@ -from fastcdm.render.render_worker import RenderWorker +from fastcdm.render.render_worker import RenderResult, RenderWorker from fastcdm.matcher import update_inliers, HungarianMatcher, SimpleAffineTransform from fastcdm.clean import ( clean, @@ -291,17 +291,23 @@ def render(self, latex_list: list) -> list: latex_strings = [ f"$${s}$$" if not s.startswith("$$") else s for s in latex_list ] - imgs = self.render_worker.render(latex_strings) + results = self.render_worker.render(latex_strings) except Exception as e: print("Rendering failed:") print("=" * 30) print(traceback.format_exc()) return [] - assert len(imgs) == len( + assert len(results) == len( latex_strings ), "Number of rendered images must match number of input strings" - return imgs + return [result.image for result in results] + + def render_results(self, latex_list: list) -> List[RenderResult]: + latex_strings = [ + f"$${s}$$" if not s.startswith("$$") else s for s in latex_list + ] + return self.render_worker.render(latex_strings) def compute(self, gt: str, pred: str, visualize: bool = False) -> tuple: """ diff --git a/fastcdm/render/render_worker.py b/fastcdm/render/render_worker.py index 111a586..3d35dff 100644 --- a/fastcdm/render/render_worker.py +++ b/fastcdm/render/render_worker.py @@ -2,7 +2,8 @@ import cv2 import random import numpy as np -from typing import List +from dataclasses import dataclass +from typing import List, Optional from selenium import webdriver from selenium.webdriver.chrome.service import Service as ChromeService @@ -13,6 +14,16 @@ from webdriver_manager.chrome import ChromeDriverManager +@dataclass +class RenderResult: + image: Optional[np.ndarray] + error: bool + error_text: Optional[str] + width: int + height: int + error_type: Optional[str] = None + + class RenderWorker: """ 一个使用 Selenium Headless Chrome 渲染HTML内容的工具类。 @@ -76,7 +87,7 @@ def __init__(self, template_file: str, timeout: int = 15, driver_path: str = Non EC.presence_of_all_elements_located((By.ID, "container")) ) - def render(self, contents: List[str]) -> List[np.ndarray]: + def render(self, contents: List[str]) -> List[RenderResult]: """ 渲染一组内容并返回每个元素的截图。 """ @@ -113,13 +124,13 @@ def render(self, contents: List[str]) -> List[np.ndarray]: # 获取每个渲染元素的边界框 rects = self.get_rects() - cropped_imgs = [] + results = [] img_h, img_w = fullpage_img.shape[:2] # 根据边界框裁剪出每个元素的图像 for rect in rects: if rect is None: - cropped_imgs.append(None) + results.append(RenderResult(None, True, "Invalid capture rectangle", 0, 0, "invalid_capture")) else: x, y, w, h = rect # 计算一个小的随机边距，让截图更自然 @@ -132,9 +143,9 @@ def render(self, contents: List[str]) -> List[np.ndarray]: y2 = min(img_h, y + h + border_size) cropped = fullpage_img[y1:y2, x1:x2] - cropped_imgs.append(cropped) + results.append(RenderResult(cropped, cropped.size == 0, "Empty cropped image" if cropped.size == 0 else None, w, h, "empty_image" if cropped.size == 0 else None)) - return cropped_imgs + return results def get_rects(self) -> list: """ From 1fe50a94473ada79dbb365819be2f44fb12b57c2 Mon Sep 17 00:00:00 2001 From: liurui Date: Thu, 10 Sep 2026 15:33:31 +0800 Subject: [PATCH 2/2] fix(render): retry transient renderer failures --- fastcdm/core.py | 48 ++++++++++++++++++++++++++++++--- fastcdm/render/render_worker.py | 17 ++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/fastcdm/core.py b/fastcdm/core.py index 7c1d56b..07880cb 100644 --- a/fastcdm/core.py +++ b/fastcdm/core.py @@ -217,6 +217,8 @@ def _has_katex_error(img: np.ndarray) -> bool: class FastCDM: + RETRYABLE_RENDER_ERRORS = {"empty_image", "invalid_capture", "webdriver_error"} + def __init__(self, chromedriver: str = None) -> None: self.chromedriver = chromedriver self.render_failure_count: int = 0 @@ -309,6 +311,40 @@ def render_results(self, latex_list: list) -> List[RenderResult]: ] return self.render_worker.render(latex_strings) + def _recover_renderer(self, failed_attempt: int) -> bool: + if failed_attempt == 1 and self.render_worker is not None: + self.render_worker.driver.refresh() + return False + self.close() + self.init_render_worker() + return True + + def _render_with_retries(self, latex_list: list): + last_results = [] + last_exception = None + rebuilt = False + for attempt in range(1, 4): + try: + last_results = self.render_results(latex_list) + last_exception = None + except Exception as exc: + last_results = [] + last_exception = exc + + if last_exception is None and len(last_results) == len(latex_list): + failures = [item for item in last_results if item.error or item.image is None] + if not failures: + return last_results, attempt, rebuilt, None + if any(item.error_type not in self.RETRYABLE_RENDER_ERRORS for item in failures): + return last_results, attempt, rebuilt, None + + if attempt < 3: + try: + rebuilt = self._recover_renderer(attempt) or rebuilt + except Exception as exc: + last_exception = exc + return last_results, 3, rebuilt, last_exception + def compute(self, gt: str, pred: str, visualize: bool = False) -> tuple: """ 计算给定的 GT 和预测 LaTeX 表达式的 CDM 分数。 @@ -323,11 +359,17 @@ def compute(self, gt: str, pred: str, visualize: bool = False) -> tuple: gt_latex, gt_color_map = preprocess(gt) pred_latex, pred_color_map = preprocess(pred) - imgs = self.render([gt_latex, pred_latex]) - if len(imgs) < 2 or imgs[0] is None or imgs[1] is None: + results, _, _, render_exception = self._render_with_retries( + [gt_latex, pred_latex] + ) + if ( + render_exception is not None + or len(results) < 2 + or any(result.error or result.image is None for result in results[:2]) + ): self.render_failure_count += 1 return (0, 0, 0, None) if visualize else (0, 0, 0) - gt_img, pred_img = imgs[0], imgs[1] + gt_img, pred_img = results[0].image, results[1].image if _has_katex_error(gt_img) or _has_katex_error(pred_img): self.render_failure_count += 1 diff --git a/fastcdm/render/render_worker.py b/fastcdm/render/render_worker.py index 3d35dff..22444e0 100644 --- a/fastcdm/render/render_worker.py +++ b/fastcdm/render/render_worker.py @@ -6,6 +6,7 @@ from typing import List, Optional from selenium import webdriver +from selenium.common.exceptions import WebDriverException from selenium.webdriver.chrome.service import Service as ChromeService from selenium.webdriver.chrome.options import Options from selenium.webdriver.common.by import By @@ -88,6 +89,22 @@ def __init__(self, template_file: str, timeout: int = 15, driver_path: str = Non ) def render(self, contents: List[str]) -> List[RenderResult]: + if not contents: + return [] + try: + return self._render(contents) + except WebDriverException as exc: + return [ + RenderResult(None, True, f"{type(exc).__name__}: {exc}", 0, 0, "webdriver_error") + for _ in contents + ] + except cv2.error as exc: + return [ + RenderResult(None, True, f"{type(exc).__name__}: {exc}", 0, 0, "invalid_capture") + for _ in contents + ] + + def _render(self, contents: List[str]) -> List[RenderResult]: """ 渲染一组内容并返回每个元素的截图。 """