Update main.py

main.py

@@ -136,56 +136,58 @@ def normalize_url(url: str) -> str:
     ))
 
 ###############################################################################
-# 3. 下载并嵌入外链图片
+# 3. 预处理：下载并嵌入远程图片
 ###############################################################################
 IMG_TAG_PATTERN = re.compile(
     r'<image[^>]+(?:href|xlink:href)\s*=\s*["\']([^"\']+)["\']',
-    re.I,
+    re.I
 )
 
-def download_and_encode(url: str) -> str:
-    """下载远程图片并转为 data URI（Base64）"""
-    try:
-        safe_url = normalize_url(url)  # ⭐ 关键改动
-        req = urllib.request.Request(safe_url, headers={"User-Agent": "Mozilla/5.0"})
-        with urllib.request.urlopen(req, timeout=20) as resp:
-            data = resp.read()
-        mime, _ = mimetypes.guess_type(safe_url)
-        mime = mime or "image/png"
-        # b64 = base64.b64encode(data).decode("ascii")
-        b64 = base64.b64encode(data).decode()      # 新的，与 Gradio 版本一致
-        return f"data:{mime};base64,{b64}"
-    except Exception as e:
-        print(f"[WARN] 下载外链图片失败 {url}: {e}")
-        return url  # 失败则返回原链接
-
 def embed_external_images(svg_path: str) -> str:
-    """把 SVG 中的远程图片下载并嵌入（Base64），返回新的临时 SVG 路径"""
+    """把 svg 中的外链图片转为 data URI，返回新的 svg 路径"""
     with open(svg_path, "r", encoding="utf-8") as f:
         svg_text = f.read()
-    if "http://" not in svg_text and "https://" not in svg_text:
-        return svg_path  # 无外链直接返回
 
-    def replacer(match: re.Match) -> str:
-        url = match.group(1)
-        if url.startswith(("http://", "https://")):
-            data_uri = download_and_encode(url)
-            return match.group(0).replace(url, data_uri)
-        return match.group(0)
-
-    new_svg = IMG_TAG_PATTERN.sub(replacer, svg_text)
+    # 若无 http/https 外链直接返回
+    if "http://" not in svg_text and "https://" not in svg_text:
+        return svg_path
+
+    def download_and_encode(url: str) -> str:
+        """下载图片并转 data URI；失败则返回原 URL"""
+        try:
+            safe_url = normalize_url(url)  # ⭐ 关键改动
+            req = urllib.request.Request(
+                safe_url,
+                headers={"User-Agent": "Mozilla/5.0"}
+            )
+            with urllib.request.urlopen(req, timeout=20) as resp:
+                data = resp.read()
+            mime, _ = mimetypes.guess_type(safe_url)
+            mime = mime or "image/png"
+            b64  = base64.b64encode(data).decode()
+            return f"data:{mime};base64,{b64}"
+        except Exception as e:
+            print(f"[WARN] 下载 {url} 失败：{e}")
+            return url  # 失败则保留原链接
+
+    # 批量替换
+    new_svg_text = IMG_TAG_PATTERN.sub(
+        lambda m: m.group(0).replace(m.group(1), download_and_encode(m.group(1))),
+        svg_text
+    )
 
-    # 若缺失 xlink 命名空间，则补上
-    if "xmlns:xlink" not in new_svg:
-        new_svg = new_svg.replace(
+    # 若缺少 xlink 命名空间则补上
+    if "xmlns:xlink" not in new_svg_text:
+        new_svg_text = new_svg_text.replace(
             "<svg", '<svg xmlns:xlink="http://www.w3.org/1999/xlink"', 1
         )
 
+    # 写入临时文件
     tmp_dir = tempfile.mkdtemp()
-    new_path = os.path.join(tmp_dir, Path(svg_path).name)
-    with open(new_path, "w", encoding="utf-8") as f:
-        f.write(new_svg)
-    return new_path
+    new_svg_path = os.path.join(tmp_dir, Path(svg_path).name)
+    with open(new_svg_path, "w", encoding="utf-8") as f:
+        f.write(new_svg_text)
+    return new_svg_path
 
 ###############################################################################
 # 4. 核心转换函数