From 8538520548bc601585fec070ca558bf9fbac6faf Mon Sep 17 00:00:00 2001 From: personal82555 Date: Tue, 13 Oct 2026 11:52:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E6=A1=A3=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E8=BD=AC=E5=9C=88=20=E2=80=94=20relay?= =?UTF-8?q?=E5=88=86=E5=9D=97=E5=B9=B6=E5=8F=91=E7=BF=BB=E8=AF=91(8?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B,=20=E5=A4=A7=E6=96=87=E6=A1=A3=E4=BB=8E?= =?UTF-8?q?=E5=87=A0=E5=88=86=E9=92=9F=E7=BC=A9=E5=88=B0=E5=87=A0=E5=8D=81?= =?UTF-8?q?=E7=A7=92),=20=E5=89=8D=E7=AB=AFfetch=E5=8A=A08=E5=88=86?= =?UTF-8?q?=E9=92=9F=E8=B6=85=E6=97=B6+=E6=98=8E=E7=A1=AE=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA,=20nginx=20read/send=20timeout=2030?= =?UTF-8?q?0=E2=86=92600s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/it-tools-relay/server.py | 15 ++++++++++++--- nginx.conf | 3 ++- src/tools/translator/translator.vue | 20 +++++++++++++++++--- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/docker/it-tools-relay/server.py b/docker/it-tools-relay/server.py index b50d1c9..d9f6888 100644 --- a/docker/it-tools-relay/server.py +++ b/docker/it-tools-relay/server.py @@ -1724,13 +1724,22 @@ class Handler(BaseHTTPRequestHandler): cur = cur + "\n" + para if cur else para if cur: chunks.append(cur) - translated = [] - for i, ch in enumerate(chunks): + # 并发翻译分块(大文档不再串行等待,几十块也能几十秒完成) + from concurrent.futures import ThreadPoolExecutor + + def _tr(item): + idx, ch = item out = self._llm_chat([ {"role": "system", "content": f"你是专业文档翻译。把用户提供的文档片段翻译成{to_lang}:保留原有换行、段落结构、编号和列表格式;专有名词、数字、日期原样保留;只输出译文,不要解释。"}, {"role": "user", "content": ch}, ]) - translated.append(out.strip()) + return idx, out.strip() + + workers = min(8, max(1, len(chunks))) + with ThreadPoolExecutor(max_workers=workers) as ex: + results = list(ex.map(_tr, list(enumerate(chunks)))) + results.sort(key=lambda x: x[0]) + translated = [t for _, t in results] result_text = "\n\n".join(translated) shutil.rmtree(wd, ignore_errors=True) log_usage(machine, "translator") diff --git a/nginx.conf b/nginx.conf index a06bb40..02516b6 100644 --- a/nginx.conf +++ b/nginx.conf @@ -22,7 +22,8 @@ server { client_max_body_size 2g; proxy_pass http://it-tools-relay:8091/; proxy_connect_timeout 5s; - proxy_read_timeout 300s; + proxy_read_timeout 600s; + proxy_send_timeout 600s; } # AI retouch (iopaint container on host) - protected diff --git a/src/tools/translator/translator.vue b/src/tools/translator/translator.vue index 7e8cd65..00b882e 100644 --- a/src/tools/translator/translator.vue +++ b/src/tools/translator/translator.vue @@ -173,7 +173,16 @@ async function translateDoc() { const fd = new FormData(); fd.append('file', docFile.value); fd.append('to', langName(docTo.value)); - const res = await fetch('/relay/translate-doc', { method: 'POST', body: fd, headers: licenseHeaders('translator') }); + // 前端超时保护:大文档超过 8 分钟视为失败,避免一直转圈 + const ctrl = new AbortController(); + const timer = setTimeout(() => ctrl.abort(), 8 * 60 * 1000); + let res: Response; + try { + res = await fetch('/relay/translate-doc', { method: 'POST', body: fd, headers: licenseHeaders('translator'), signal: ctrl.signal }); + } + finally { + clearTimeout(timer); + } const j = await res.json().catch(() => ({})); if (!res.ok || j.code !== 200) { throw new Error(j.message || `HTTP ${res.status}`); @@ -183,7 +192,12 @@ async function translateDoc() { genHist.add({ title: `文档翻译: ${docFile.value.name}`, detail: `${j.data.chars} 字 → ${langName(docTo.value)}` }); } catch (e: any) { - docError.value = String(e?.message || e); + if (e?.name === 'AbortError') { + docError.value = '翻译超时(超过 8 分钟):文档过大,请拆分后重试,或减小文档篇幅。'; + } + else { + docError.value = String(e?.message || e); + } } finally { docLoading.value = false; @@ -307,7 +321,7 @@ onUnmounted(() => {