From d5712862b248f3396dfaf681ee9f9751752a02b9 Mon Sep 17 00:00:00 2001
From: xunbu <xunbu3@qq.com>
Date: Sat, 24 May 2025 22:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96minerU=E7=9A=84=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                         | 111 ++++++++++----------
 docutranslate/converter/converter_mineru.py |  18 +++-
 2 files changed, 68 insertions(+), 61 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c7b3ca..afea7d0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,6 @@
     <list default="true" id="6b18b44a-df57-4212-a857-9e291ebe5dd2" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/docutranslate/converter/converter_mineru.py" beforeDir="false" afterPath="$PROJECT_DIR$/docutranslate/converter/converter_mineru.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -37,62 +36,62 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
-    &quot;JavaScript 调试.output.html (1).executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.output.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.regex.md_中文.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.regex_中文.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.test.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.test2.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.test2_英文.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.test4-1_中文.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.互联网认证授权机制.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.互联网认证授权机制_英文.html.executor&quot;: &quot;Run&quot;,
-    &quot;JavaScript 调试.毕业论文_英文.html.executor&quot;: &quot;Run&quot;,
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;Python 测试.Python 测试 (markdown_mask.py 内).executor&quot;: &quot;Run&quot;,
-    &quot;Python 测试.markdown_mask.Test.test_basic_link_masking 的 Python 测试.executor&quot;: &quot;Run&quot;,
-    &quot;Python 测试.pytest (test_html.py 内).executor&quot;: &quot;Run&quot;,
-    &quot;Python.1test.executor&quot;: &quot;Run&quot;,
-    &quot;Python.2test2 (1).executor&quot;: &quot;Run&quot;,
-    &quot;Python.PDFtranslater (1).executor&quot;: &quot;Run&quot;,
-    &quot;Python.PDFtranslater (2).executor&quot;: &quot;Run&quot;,
-    &quot;Python.agent.executor&quot;: &quot;Debug&quot;,
-    &quot;Python.agent_utils.executor&quot;: &quot;Run&quot;,
-    &quot;Python.app (1).executor&quot;: &quot;Run&quot;,
-    &quot;Python.app.executor&quot;: &quot;Run&quot;,
-    &quot;Python.app2.executor&quot;: &quot;Run&quot;,
-    &quot;Python.app_test (1).executor&quot;: &quot;Run&quot;,
-    &quot;Python.convert.executor&quot;: &quot;Run&quot;,
-    &quot;Python.converter_docling.executor&quot;: &quot;Run&quot;,
-    &quot;Python.converter_mineru.executor&quot;: &quot;Run&quot;,
-    &quot;Python.markdown_splitter.executor&quot;: &quot;Debug&quot;,
-    &quot;Python.markdown_utils.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test1.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test2.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test3.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test4.executor&quot;: &quot;Run&quot;,
-    &quot;Python.testhtml.executor&quot;: &quot;Run&quot;,
-    &quot;Python.translater.executor&quot;: &quot;Run&quot;,
-    &quot;Python.切分测试.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;dev&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/jxgm/Desktop/translate/docutranslate&quot;,
-    &quot;list.type.of.created.stylesheet&quot;: &quot;CSS&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "DefaultHtmlFileTemplate": "HTML File",
+    "JavaScript 调试.output.html (1).executor": "Run",
+    "JavaScript 调试.output.html.executor": "Run",
+    "JavaScript 调试.regex.md_中文.html.executor": "Run",
+    "JavaScript 调试.regex_中文.html.executor": "Run",
+    "JavaScript 调试.test.html.executor": "Run",
+    "JavaScript 调试.test2.html.executor": "Run",
+    "JavaScript 调试.test2_英文.html.executor": "Run",
+    "JavaScript 调试.test4-1_中文.html.executor": "Run",
+    "JavaScript 调试.互联网认证授权机制.html.executor": "Run",
+    "JavaScript 调试.互联网认证授权机制_英文.html.executor": "Run",
+    "JavaScript 调试.毕业论文_英文.html.executor": "Run",
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "Python 测试.Python 测试 (markdown_mask.py 内).executor": "Run",
+    "Python 测试.markdown_mask.Test.test_basic_link_masking 的 Python 测试.executor": "Run",
+    "Python 测试.pytest (test_html.py 内).executor": "Run",
+    "Python.1test.executor": "Run",
+    "Python.2test2 (1).executor": "Run",
+    "Python.PDFtranslater (1).executor": "Run",
+    "Python.PDFtranslater (2).executor": "Run",
+    "Python.agent.executor": "Debug",
+    "Python.agent_utils.executor": "Run",
+    "Python.app (1).executor": "Run",
+    "Python.app.executor": "Run",
+    "Python.app2.executor": "Run",
+    "Python.app_test (1).executor": "Run",
+    "Python.convert.executor": "Run",
+    "Python.converter_docling.executor": "Run",
+    "Python.converter_mineru.executor": "Run",
+    "Python.markdown_splitter.executor": "Debug",
+    "Python.markdown_utils.executor": "Run",
+    "Python.test.executor": "Run",
+    "Python.test1.executor": "Run",
+    "Python.test2.executor": "Run",
+    "Python.test3.executor": "Run",
+    "Python.test4.executor": "Run",
+    "Python.testhtml.executor": "Run",
+    "Python.translater.executor": "Run",
+    "Python.切分测试.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "main",
+    "last_opened_file_path": "C:/Users/jxgm/Desktop/translate/docutranslate",
+    "list.type.of.created.stylesheet": "CSS",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\jxgm\Desktop\translate\docutranslate" />
diff --git a/docutranslate/converter/converter_mineru.py b/docutranslate/converter/converter_mineru.py
index 138def7..9a10730 100644
--- a/docutranslate/converter/converter_mineru.py
+++ b/docutranslate/converter/converter_mineru.py
@@ -8,14 +8,22 @@ from docutranslate.utils.markdown_utils import embed_inline_image_from_zip
 
 URL = 'https://mineru.net/api/v4/file-urls/batch'
 
-client = httpx.Client(trust_env=False)
+timeout = httpx.Timeout(
+    connect=5.0,      # 连接超时 (建立连接的最长时间)
+    read=120.0,        # 读取超时 (等待服务器响应的最长时间)
+    write=120.0,       # 写入超时 (发送数据的最长时间)
+    pool=1.0          # 从连接池获取连接的超时时间
+)
+
+
+client = httpx.Client(trust_env=False,timeout=timeout)
 
 
 # TODO: 提供更详细的logger
 class ConverterMineru(Converter):
     def __init__(self, token: str, formula=True):
         self.mineru_token = token.strip()
-        self.client_async = httpx.AsyncClient()
+        self.client_async = httpx.AsyncClient(timeout=timeout)
         self.formula = formula
 
     def _get_header(self):
@@ -36,7 +44,7 @@ class ConverterMineru(Converter):
 
     def upload(self, document: Document):
         # 获取上传链接
-        response = client.post(URL, headers=self._get_header(), json=self._get_upload_data(document),timeout=120)
+        response = client.post(URL, headers=self._get_header(), json=self._get_upload_data(document))
         response.raise_for_status()
         result = response.json()
         # print('response success. result:{}'.format(result))
@@ -45,7 +53,7 @@ class ConverterMineru(Converter):
             urls = result["data"]["file_urls"]
             # print('batch_id:{},urls:{}'.format(batch_id, urls))
             # 获取
-            res_upload = client.put(urls[0], content=document.filebytes,timeout=120)
+            res_upload = client.put(urls[0], content=document.filebytes)
             res_upload.raise_for_status()
             # print(f"{urls[0]} upload success")
             return batch_id
@@ -109,7 +117,7 @@ def get_md_from_zip_url_with_inline_images(
     """
     try:
         print(f"正在从 {zip_url} 下载ZIP文件 (使用 httpx.get)...")
-        response = client.get(zip_url, timeout=120.0)  # 增加超时
+        response = client.get(zip_url)  # 增加超时
         response.raise_for_status()
         print("ZIP文件下载完成。")
         return embed_inline_image_from_zip(response.content, filename_in_zip=filename_in_zip, encoding=encoding)