Transforms complex documents like PDFs and Office docs into LLM-ready markdown/JSON for your Agentic workflows.
Python ai4sciencedocument-analysisdocxextract-datalayout-analysisocrparserpdfpdf-converterpdf-extractor-llmpdf-extractor-pretrainpdf-extractor-ragpdf-parserpptxpythonxlsx
feat(webui): add compact upload card with progress and cancellation
myhloli2a722f72de09
diff --git a/mineru/kit/gradio/app.py b/mineru/kit/gradio/app.pyindex ab8f34b2..49e456dc 100644--- a/mineru/kit/gradio/app.py+++ b/mineru/kit/gradio/app.py@@ -259,6 +259,16 @@ def _resource_text(resource_name: str) -> str:return resource_path.read_text(encoding="utf-8")+def _render_upload(file_types: list[str]) -> str:+ """渲染动作图标空状态和紧凑文件条,双语标记只作用于文字叶节点。"""+ template = _resource_text("gradio_upload.html")+ template = template.replace("{{ACCEPT}}", html.escape(",".join(file_types), quote=True))+ template = template.replace("{{UPLOAD_LABEL}}", html.escape(MESSAGES["upload_drop"][1], quote=True))+ for key in ("upload_choose", "upload_drag", "upload_paste", "upload_document", "upload_image", "upload_or"):+ template = template.replace("{{" + key.upper() + "}}", localized_text(key))+ return template++def _download_icon_css() -> str:"""为各下载格式生成本地 SVG 遮罩,随按钮文字适配主题且不改变无障碍名称。"""rules = []@@ -366,6 +376,16 @@ def build_gradio_app(raise ValueError("V1 API server did not advertise any parsing tier")preferred_tier = _default_tier(capabilities)file_types = _supported_file_types()++ def upload_context(_data: object, request: object | None = None) -> dict[str, str]:+ """为可取消的进度上传提供原生 Gradio 地址,沿用请求鉴权和反向代理挂载前缀。"""+ # Gradio 的组件服务函数传入原始 Starlette Request,普通事件则使用 gr.Request 包装。+ if request is not None and not isinstance(request, gr.Request):+ request = gr.Request(request=request)+ base_url = _gradio_public_base_url(request)+ return {"upload_url": f"{base_url}/gradio_api/upload", "file_url_prefix": f"{base_url}/gradio_api/file="}++ upload_context.__annotations__["request"] = gr.Requestexamples = _example_files(file_types) if enable_example else []app_css = _resource_text("gradio_app.css") + _KIT_MENU_CSS + _download_icon_css()i18n = gr.I18n(**translations())@@ -409,18 +429,15 @@ def build_gradio_app()upload_control = gr.HTML(value="",- html_template='<label class="mineru-upload-target"><input type="file" accept="'- + ",".join(file_types)- + '" />'- '<span class="mineru-upload-label"></span></label><div class="mineru-upload-status" role="status"></div>'- '<button type="button" class="mineru-upload-retry" hidden></button>',+ html_template=_render_upload(file_types),js_on_load="("+ _resource_text("gradio_upload.js")- + ")({element, props, upload, accepted: "+ + ")({element, props, server, accepted: "+ json.dumps(file_types)+ ", imageExtensions: "+ json.dumps(sorted(IMAGE_EXTENSIONS))+ "})",+ server_functions=[upload_context],elem_classes=["mineru-upload-file"],)with gr.Group():@@ -497,7 +514,7 @@ def build_gradio_app(interactive=False,elem_classes=["mineru-convert-button"],)- clear_button = gr.ClearButton(value=i18n("mineru.clear"), scale=1, min_width=1)+ clear_button = gr.ClearButton(value=i18n("mineru.clear"), scale=1, min_width=1, elem_id="mineru-kit-clear")status_panel = gr.HTML(_status_html(), elem_classes=["mineru-status-panel"])if examples:gr.Examples(diff --git a/mineru/kit/gradio/i18n.py b/mineru/kit/gradio/i18n.pyindex 80f5561b..6cf8891c 100644--- a/mineru/kit/gradio/i18n.py+++ b/mineru/kit/gradio/i18n.py@@ -26,7 +26,20 @@ MESSAGES: dict[str, tuple[str, str]] = {"download": ("Download", "下载"),"upload": ("Select a document to parse", "请选择要解析的文件"),"upload_drop": ("Choose, drop or paste a document or image", "选择、拖放或粘贴文件或图片"),+ "upload_choose": ("Choose", "选择"),+ "upload_drag": ("Drop", "拖放"),+ "upload_paste": ("Paste", "粘贴"),+ "upload_document": ("Document", "文档"),+ "upload_image": ("Image", "图片"),+ "upload_or": ("or", "或"),"upload_retry": ("Retry", "重试"),+ "upload_clear": ("Clear file", "清除文件"),+ "upload_cancel": ("Cancel upload and clear file", "取消上传并清除文件"),+ "upload_complete": ("Uploaded", "已上传"),+ "upload_confirming": ("Confirming upload…", "正在确认上传…"),+ "upload_failed": ("Upload failed", "上传失败"),+ "upload_size_unknown": ("Size unavailable", "大小未知"),+ "upload_progress": ("Upload progress", "上传进度"),"uploading": ("Uploading…", "正在上传…"),"upload_unsupported": ("Unsupported file type", "不支持此文件类型"),"preparing_pdf": ("Preparing PDF preview…", "正在准备 PDF 预览…"),diff --git a/mineru/resources/gradio_app.css b/mineru/resources/gradio_app.cssindex 8f872a0b..e21e0fa6 100644--- a/mineru/resources/gradio_app.css+++ b/mineru/resources/gradio_app.css@@ -405,10 +405,76 @@ body.dark .gradio-container {}/* 上传外观和原生文件桥接解耦,状态变化不会重建预览。 */-.mineru-upload-target { display: flex; align-items: center; justify-content: center; min-height: 110px; padding: 16px; border: 1px dashed var(--border-color-primary); border-radius: 8px; cursor: pointer; overflow-wrap: anywhere; }+.mineru-upload-target {+ display: flex; align-items: center; justify-content: center;+ box-sizing: border-box; min-height: 132px; padding: 20px 12px;+ border: 1px dashed var(--border-color-primary); border-radius: 10px;+ color: var(--body-text-color); cursor: pointer; overflow-wrap: anywhere; text-align: center;+}.mineru-upload-target input { position: absolute; width: 1px; height: 1px; opacity: 0; }.mineru-upload-target:focus-within { outline: 2px solid var(--color-accent); }+.mineru-upload-file [hidden] { display: none !important; }+.mineru-upload-empty { display: flex; flex-direction: column; align-items: center; gap: 18px; max-width: 100%; }+.mineru-upload-actions { display: flex; justify-content: center; flex-wrap: wrap; gap: 22px; }+.mineru-upload-action { display: flex; flex-direction: column; align-items: center; gap: 8px; font-size: 14px; line-height: 20px; }+.mineru-upload-action svg { width: 25px; height: 25px; }+.mineru-upload-types {+ display: flex; justify-content: center; align-items: center; flex-wrap: wrap; gap: 14px;+ color: var(--body-text-color-subdued); font-size: 12px; line-height: 18px;+}+.mineru-upload-type { display: inline-flex; align-items: center; gap: 5px; }+.mineru-upload-type svg { width: 15px; height: 15px; }+.mineru-upload-empty svg { flex-shrink: 0; margin: 0; }+.mineru-upload-file-row {+ position: relative; isolation: isolate; overflow: hidden;+ display: flex; align-items: center; gap: 8px; min-height: 64px; padding: 12px 10px 12px 12px;+ box-sizing: border-box; border: 1px solid var(--border-color-primary); border-radius: 10px;+ background: var(--background-fill-primary); color: var(--body-text-color);+}+.mineru-upload-fill {+ position: absolute; z-index: -1; left: 0; top: 0; bottom: 0; width: 0;+ background: rgba(249, 115, 22, 0.13); pointer-events: none; transition: opacity 0.55s ease;+}+.dark .mineru-upload-fill { background: rgba(249, 115, 22, 0.18); }+.mineru-upload-file-row.is-settled .mineru-upload-fill { opacity: 0; }+.mineru-upload-file-icon {+ display: flex; align-items: center; justify-content: center; flex: 0 0 30px; width: 30px; height: 38px;+ border-radius: 7px; color: #b95810; background: #fff1e3;+}+.dark .mineru-upload-file-icon { color: #f4ad72; background: #39291d; }+.mineru-upload-details { display: flex; flex-direction: column; flex: 1 1 0; min-width: 0; gap: 2px; }+.mineru-upload-label { display: flex; min-width: 0; font-size: 14px; font-weight: 500; line-height: 20px; }+.mineru-upload-stem { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }+.mineru-upload-extension { flex: 0 0 auto; }+.mineru-upload-size { font-size: 12px; line-height: 16px; color: var(--body-text-color-subdued); font-variant-numeric: tabular-nums; }+.mineru-upload-indicator {+ display: flex; justify-content: flex-end; align-items: center; flex: 0 0 28px;+ font-size: 12px; color: var(--body-text-color-subdued); font-variant-numeric: tabular-nums;+}+.mineru-upload-file .mineru-upload-remove {+ display: flex; align-items: center; justify-content: center; flex: 0 0 28px;+ width: 28px !important; height: 32px !important; padding: 0 !important; margin: 0;+ border: 0 !important; border-radius: 6px; cursor: pointer;+ color: var(--body-text-color-subdued) !important; background: transparent !important;+}+.mineru-upload-file .mineru-upload-remove:hover {+ color: var(--body-text-color) !important; background: var(--background-fill-secondary) !important;+}+.mineru-upload-remove:focus-visible { outline: 2px solid var(--color-accent); outline-offset: -2px; }+.mineru-upload-file-row svg { flex-shrink: 0; margin: 0; }+/* Gradio 的正文样式也会单独设置 SVG 子元素颜色,图标路径须显式继承类型色。 */+.mineru-upload-file-row svg, .mineru-upload-file-row svg * { color: inherit !important; }+.mineru-upload-meter {+ position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0;+ clip-path: inset(50%); overflow: hidden; white-space: nowrap;+}.mineru-upload-status { font-size: 13px; margin-top: 6px; overflow-wrap: anywhere; }+.mineru-upload-status:empty { display: none; }+@media (pointer: coarse) {+ .mineru-upload-file .mineru-upload-remove { flex-basis: 44px; width: 44px !important; height: 44px !important; }+ .mineru-upload-file-row { padding-top: 9px; padding-bottom: 9px; }+}+@media (prefers-reduced-motion: reduce) { .mineru-upload-fill { transition: none; } }.mineru-pdf-host [role="status"], .mineru-pdf-host [role="alert"] { padding: 24px; }.mineru-kit-preview:has(.mineru-pdf-host iframe, .mineru-pdf-host [role]) .mineru-kit-generic-preview { display: none !important; }diff --git a/mineru/resources/gradio_upload.LICENSE b/mineru/resources/gradio_upload.LICENSEnew file mode 100644index 00000000..f7a80122--- /dev/null+++ b/mineru/resources/gradio_upload.LICENSE@@ -0,0 +1,19 @@+Lucide 0.468.0 — upload, square-dashed-mouse-pointer, clipboard-paste,+file-text, image, check and x icons used in gradio_upload.html.+Source: https://github.com/lucide-icons/lucide/tree/0.468.0++ISC License++Copyright (c) for portions of Lucide are held by Cole Bemis 2013-2022 as part of Feather (MIT). All other copyright (c) for Lucide are held by Lucide Contributors 2022.++Permission to use, copy, modify, and/or distribute this software for any+purpose with or without fee is hereby granted, provided that the above+copyright notice and this permission notice appear in all copies.++THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.diff --git a/mineru/resources/gradio_upload.html b/mineru/resources/gradio_upload.htmlnew file mode 100644index 00000000..1a97a05b--- /dev/null+++ b/mineru/resources/gradio_upload.html@@ -0,0 +1,96 @@+<!-- 图标取自 Lucide 0.468.0,许可见 gradio_upload.LICENSE;SVG 随文字颜色适配主题。 -->+<label class="mineru-upload-target">+ <input type="file" accept="{{ACCEPT}}" aria-label="{{UPLOAD_LABEL}}"+ data-mineru-i18n-key="upload_drop" data-mineru-i18n-attr="aria-label" />+ <span class="mineru-upload-empty" aria-hidden="true">+ <span class="mineru-upload-actions">+ <span class="mineru-upload-action">+ <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 24 24" fill="none"+ stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"+ aria-hidden="true" focusable="false">+ <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />+ <polyline points="17 8 12 3 7 8" />+ <line x1="12" x2="12" y1="3" y2="15" />+ </svg>+ {{UPLOAD_CHOOSE}}+ </span>+ <span class="mineru-upload-action">+ <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 24 24" fill="none"+ stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"+ aria-hidden="true" focusable="false">+ <path d="M12.034 12.681a.498.498 0 0 1 .647-.647l9 3.5a.5.5 0 0 1-.033.943l-3.444 1.068a1 1 0 0 0-.66.66l-1.067 3.443a.5.5 0 0 1-.943.033z" />+ <path d="M5 3a2 2 0 0 0-2 2M19 3a2 2 0 0 1 2 2M5 21a2 2 0 0 1-2-2M9 3h1M9 21h2M14 3h1M3 9v1M21 9v2M3 14v1" />+ </svg>+ {{UPLOAD_DRAG}}+ </span>+ <span class="mineru-upload-action">+ <svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 24 24" fill="none"+ stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"+ aria-hidden="true" focusable="false">+ <path d="M15 2H9a1 1 0 0 0-1 1v2c0 .6.4 1 1 1h6c.6 0 1-.4 1-1V3c0-.6-.4-1-1-1Z" />+ <path d="M8 4H6a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2M16 4h2a2 2 0 0 1 2 2v2M11 14h10" />+ <path d="m17 10 4 4-4 4" />+ </svg>+ {{UPLOAD_PASTE}}+ </span>+ </span>+ <span class="mineru-upload-types">+ <span class="mineru-upload-type">+ <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 24 24" fill="none"+ stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"+ aria-hidden="true" focusable="false">+ <path d="M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z" />+ <path d="M14 2v4a2 2 0 0 0 2 2h4M10 9H8M16 13H8M16 17H8" />+ </svg>+ {{UPLOAD_DOCUMENT}}+ </span>+ {{UPLOAD_OR}}+ <span class="mineru-upload-type">+ <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 24 24" fill="none"+ stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"+ aria-hidden="true" focusable="false">+ <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />+ <circle cx="9" cy="9" r="2" />+ <path d="m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21" />+ </svg>+ {{UPLOAD_IMAGE}}+ </span>+ </span>+ </span>+</label>+<div class="mineru-upload-file-row" hidden>+ <span class="mineru-upload-fill" aria-hidden="true"></span>+ <span class="mineru-upload-file-icon" aria-hidden="true">+ <svg class="mineru-upload-document-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20"+ viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"+ stroke-linecap="round" stroke-linejoin="round" focusable="false">+ <path d="M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z" />+ <path d="M14 2v4a2 2 0 0 0 2 2h4M10 9H8M16 13H8M16 17H8" />+ </svg>+ <svg class="mineru-upload-image-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20"+ viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"+ stroke-linecap="round" stroke-linejoin="round" focusable="false" hidden>+ <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />+ <circle cx="9" cy="9" r="2" />+ <path d="m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21" />+ </svg>+ </span>+ <span class="mineru-upload-details">+ <span class="mineru-upload-label"><span class="mineru-upload-stem"></span><span class="mineru-upload-extension"></span></span>+ <span class="mineru-upload-size"></span>+ </span>+ <span class="mineru-upload-indicator" aria-hidden="true">+ <span class="mineru-upload-percent"></span>+ <svg class="mineru-upload-complete" xmlns="http://www.w3.org/2000/svg" width="17" height="17"+ viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"+ stroke-linecap="round" stroke-linejoin="round" focusable="false" hidden><path d="m20 6-11 11-5-5" /></svg>+ </span>+ <button type="button" class="mineru-upload-remove" aria-label="Clear file" title="Clear file">+ <svg xmlns="http://www.w3.org/2000/svg" width="17" height="17" viewBox="0 0 24 24" fill="none"+ stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"+ aria-hidden="true" focusable="false"><path d="M18 6 6 18M6 6l12 12" /></svg>+ </button>+ <span class="mineru-upload-meter" role="progressbar" aria-label="Upload progress" aria-valuemin="0" aria-valuemax="100"></span>+</div>+<div class="mineru-upload-status" role="status"></div>+<button type="button" class="mineru-upload-retry" hidden></button>diff --git a/mineru/resources/gradio_upload.js b/mineru/resources/gradio_upload.jsindex 2ae86151..e401e507 100644--- a/mineru/resources/gradio_upload.js+++ b/mineru/resources/gradio_upload.js@@ -1,90 +1,209 @@-// 上传控件只通过 Gradio 的公开 upload/props 接口写入文件,不读取框架内部状态。-({ element, props, upload, accepted, imageExtensions }) => {+// 上传沿用 Gradio 的 HTTP 端点和 props 桥接;XHR 仅补充真实字节进度与中止能力。+({ element, props, server, accepted, imageExtensions }) => {let id = "";let localFile = null;let uploadedFile = null;+ let shownFile = null;let pending = false;let bridged = "";- // DOM 引用按需取得,兼容组件对属性更新的模板协调。+ let transfer = null;+ let progress = 0;+ let transferred = 0;+ let message = "";+ let failed = false;+ let settled = false;+ let settleTimer = null;+ // DOM 按需取得,兼容 Gradio 对属性更新的模板协调。+ const node = name => element.querySelector(`.mineru-upload-${name}`);const input = () => element.querySelector('input[type="file"]');- const label = () => element.querySelector(".mineru-upload-label");- const status = () => element.querySelector(".mineru-upload-status");- const retry = () => element.querySelector(".mineru-upload-retry");const text = key => window.__mineruI18n?.text(key) || key;const identity = () => Array.from(crypto.getRandomValues(new Uint8Array(16)), value => value.toString(16).padStart(2, "0")).join("");const isImage = name => imageExtensions.some(extension => name.toLowerCase().endsWith(`.${extension}`));- // 文件名和服务器错误只显示为文本;错误状态允许使用同一文件重试。- const display = (name, message = "", failed = false) => {- label().textContent = name || text("upload_drop");- status().textContent = message;- status().setAttribute("role", failed ? "alert" : "status");- retry().hidden = !failed;- retry().textContent = text("upload_retry");+ // 本地 File 和 Gradio FileData 共用文件名规则,不把文件名当作 HTML。+ const fileName = file => file?.orig_name || file?.name || file?.path?.split(/[\\/]/).pop() || "";+ // 使用十进制单位;未知大小不能伪装成空文件。+ const formatSize = bytes => {+ if (!Number.isFinite(bytes) || bytes < 0) return text("upload_size_unknown");+ const unit = bytes > 0 ? Math.min(4, Math.floor(Math.log10(bytes) / 3)) : 0;+ return `${unit ? (bytes / 1000 ** unit).toFixed(1) : bytes} ${["B", "KB", "MB", "GB", "TB"][unit]}`;};- // 每次文件选择有独立闭包身份,旧上传即使成功也不会写入原生文件桥接组件。+ // 只切换空状态和文件条,进度、文件名及错误均写入固定叶节点。+ const render = () => {+ const name = fileName(shownFile);+ const complete = Boolean(uploadedFile && !pending && !failed);+ const size = shownFile?.size;+ const extension = name.lastIndexOf(".");+ node("target").hidden = Boolean(name);+ node("file-row").hidden = !name;+ node("file-row").classList.toggle("is-settled", settled);+ node("stem").textContent = extension > 0 ? name.slice(0, extension) : name;+ node("extension").textContent = extension > 0 ? name.slice(extension) : "";+ node("label").title = name;+ node("size").textContent = pending && progress !== null+ ? `${formatSize(transferred)} / ${formatSize(size)}` : formatSize(size);+ node("document-icon").toggleAttribute("hidden", isImage(name));+ node("image-icon").toggleAttribute("hidden", !isImage(name));+ node("indicator").hidden = !complete && (!pending || progress === null);+ node("percent").hidden = !pending || progress === null;+ node("percent").textContent = `${Math.floor(progress || 0)}%`;+ node("complete").toggleAttribute("hidden", !complete);+ node("complete").setAttribute("aria-label", text("upload_complete"));+ node("fill").style.width = `${progress || 0}%`;+ node("fill").hidden = failed || (!pending && !uploadedFile);+ node("meter").hidden = !pending;+ node("meter").setAttribute("aria-label", text("upload_progress"));+ if (progress === null) node("meter").removeAttribute("aria-valuenow");+ else node("meter").setAttribute("aria-valuenow", String(Math.floor(progress)));+ node("meter").setAttribute("aria-valuetext", progress === null ? text("uploading")+ : `${Math.floor(progress)}% · ${node("size").textContent}`);+ const clearLabel = text(pending ? "upload_cancel" : "upload_clear");+ node("remove").title = clearLabel;+ node("remove").setAttribute("aria-label", `${clearLabel}: ${name}`);+ node("status").textContent = message || (pending && progress === 100 ? text("upload_confirming")+ : pending && progress === null ? text("uploading") : "");+ node("status").setAttribute("role", failed ? "alert" : "status");+ node("retry").hidden = !failed;+ node("retry").textContent = text("upload_retry");+ };+ // 统一保存当前可见文件,语言初始化和预览准备回执不能清空已选文件名。+ const display = (file, notice = "", error = false) => {+ shownFile = file;+ message = notice;+ failed = error;+ render();+ };+ // 取消正在传输的请求与完成动画;身份失效先于 abort,迟到回调不会重绘新文件。+ const stopTransfer = () => {+ clearTimeout(settleTimer);+ settled = false;+ const previous = transfer;+ transfer = null;+ previous?.abort();+ };+ // 由公开组件服务函数提供部署地址;复用原生上传路由的登录、大小限制和缓存管理。+ const uploadFile = async (file, current) => {+ const context = await server.upload_context();+ if (id !== current) throw new DOMException("Upload cancelled", "AbortError");+ return new Promise((resolve, reject) => {+ const request = new XMLHttpRequest();+ transfer = request;+ request.open("POST", context.upload_url);+ request.withCredentials = true;+ // multipart 的真实传输比例映射到文件大小,完全不使用模拟进度计时器。+ request.upload.addEventListener("progress", event => {+ if (id !== current) return;+ progress = event.lengthComputable && event.total > 0 ? Math.min(100, event.loaded / event.total * 100) : null;+ transferred = progress === null ? 0 : Math.min(file.size, Math.floor(file.size * progress / 100));+ render();+ });+ // 只有服务端返回有效缓存路径才算上传成功,传输到 100% 时仍等待确认。+ request.addEventListener("load", () => {+ if (transfer === request) transfer = null;+ try {+ if (request.status < 200 || request.status >= 300) {+ throw new Error(request.responseText || `${text("upload_failed")} (${request.status})`);+ }+ const paths = JSON.parse(request.responseText);+ if (!Array.isArray(paths) || paths.length !== 1 || typeof paths[0] !== "string" || !paths[0]) {+ throw new Error(text("upload_failed"));+ }+ const path = paths[0];+ resolve({ path, url: context.file_url_prefix + encodeURIComponent(path).replaceAll("%2F", "/") });+ } catch (error) { reject(error); }+ });+ // 网络失败显示可重试错误,主动取消由选择身份校验静默收尾。+ request.addEventListener("error", () => {+ if (transfer === request) transfer = null;+ reject(new Error(text("upload_failed")));+ });+ request.addEventListener("abort", () => reject(new DOMException("Upload cancelled", "AbortError")));+ const body = new FormData();+ body.append("files", file, file.name);+ request.send(body);+ });+ };+ // 每次选择有独立身份,文件替换会中止旧传输;准备失败重试复用已上传的路径。const submit = async file => {- if (!file || !accepted.some(extension => file.name.toLowerCase().endsWith(extension))) {- display(file?.name, text("upload_unsupported"), false);+ if (!file) return;+ if (!accepted.some(extension => file.name.toLowerCase().endsWith(extension))) {+ display(shownFile, text("upload_unsupported"));return;}const previous = localFile === file ? uploadedFile : null;id = identity();const current = id;+ stopTransfer();localFile = file;uploadedFile = null;pending = true;+ progress = previous ? 100 : 0;+ transferred = previous ? file.size : 0;window.__mineruPdfPreview.local(file, current);- display(file.name, text("uploading"));+ display(file);props.value = JSON.stringify({ id: current, stage: "selected" });try {- // 已上传但 PDF 准备失败时只重试准备,不重复上传图片。- const result = previous || await upload(file);+ const result = previous || await uploadFile(file, current);if (id !== current) return;const data = { ...result, orig_name: file.name, size: file.size, mime_type: file.type, meta: { _type: "gradio.FileData" } };if (!window.__mineruPdfPreview.bind(data, current)) return;uploadedFile = data;pending = false;- display(file.name, isImage(file.name) ? text("preparing_pdf") : "");+ progress = 100;+ transferred = file.size;+ display(file, isImage(file.name) ? text("preparing_pdf") : "");+ // 完成填满后淡出底色;该计时器不参与实际上传进度计算。+ settleTimer = setTimeout(() => {+ if (id !== current) return;+ settled = true;+ render();+ }, 650);// 让清空事件先提交,重复准备同一服务器路径仍能触发文件变更。await new Promise(resolve => setTimeout(resolve, 0));if (id === current) props.value = JSON.stringify({ id: current, stage: "uploaded", file: data });} catch (error) {if (id !== current) return;pending = false;- display(file.name, String(error?.message || error), true);+ display(file, String(error?.message || error), true);}};- // 清除只撤销本控件身份,真正文件取消和租期回收由原生组件事件协调。+ // 文件条叉号和原生清除共用失效入口,资源租期与解析任务仍由已有清除事件回收。const invalidate = () => {id = "";+ stopTransfer();localFile = null;uploadedFile = null;pending = false;+ progress = 0;+ transferred = 0;input().value = "";- display("");+ display(null);};window.__mineruUpload = {isImage, invalidate,- // 同一次控件 change 的重复派发不再写回相同 FileData,避免触发重复源事件。+ // 同一回执重复派发不写回 FileData;迟到回执还须同时匹配本控件和预览身份。bridge(value) {let receipt;try { receipt = JSON.parse(value); } catch { return { __type__: "update" }; }const key = `${receipt.id}:${receipt.stage}`;- if (receipt.id !== window.__mineruPdfPreview.sourceId || key === bridged) return { __type__: "update" };+ if (receipt.id !== id || receipt.id !== window.__mineruPdfPreview.sourceId || key === bridged) return { __type__: "update" };bridged = key;return receipt.stage === "uploaded" ? receipt.file : null;},- // 启动脚本晚于上传组件挂载时补齐初始语言。- localize() { if (!localFile && !uploadedFile) display(""); },- // 示例写入隐藏文件组件时同步文件名,不能把它关联到旧本地 File。+ // 启动脚本晚于组件挂载时补齐当前状态的语言,不重置文件选择。+ localize() { render(); },+ // 示例直接写入隐藏 File 时补全文件类型和大小,不关联旧的本地 File。sync(file) {if (pending || (file?.path && uploadedFile?.path === file.path)) return;invalidate();- if (file) display(file.orig_name || file.path.split(/[\\/]/).pop());+ uploadedFile = file;+ progress = file ? 100 : 0;+ settled = true;+ display(file);},- // 输入准备成功或失败均在上传控件中显示,原图不会作为降级预览出现。- prepared(error) { display(localFile?.name || label().textContent, error || "", Boolean(error && localFile)); },+ // 图片转换为 PDF 等后续准备失败时保留文件条,仍可重试准备。+ prepared(error) { display(shownFile, error || "", Boolean(error && localFile)); },};+ // 选择、拖放和粘贴统一进入同一个上传生命周期。element.addEventListener("change", event => {if (event.target === input()) submit(input().files?.[0]);});@@ -93,8 +212,15 @@event.preventDefault();submit(event.dataTransfer?.files?.[0]);});- retry().addEventListener("click", () => submit(localFile));- // 剪贴板与文件选择共用唯一上传流程,不再向隐藏 gr.File 注入合成 FileList。+ node("retry").addEventListener("click", () => submit(localFile));+ // 叉号位于文件选择 label 之外,复用清除按钮的全部事件而不会打开文件选择器。+ node("remove").addEventListener("click", event => {+ event.preventDefault();+ window.__mineruPdfPreview.clear();+ document.getElementById("mineru-kit-clear").click();+ input().focus({ preventScroll: true });+ });+ // 剪贴板文件直接进入传输,截图按 MIME 补全扩展名,不注入合成 FileList。const paste = event => {const mimeExtensions = {"image/png": "png", "image/jpeg": "jpg", "image/webp": "webp", "image/gif": "gif",@@ -106,7 +232,6 @@const data = event.clipboardData;const files = data?.files?.length ? Array.from(data.files) : Array.from(data?.items || []).map(item => item.getAsFile()).filter(Boolean);const normalized = files.map(file => {- // 无扩展名截图沿用 MIME 命名;文件不经过 FileList 注入或二次上传。const extension = mimeExtensions[file.type];return !/\.[^.]+$/.test(file.name) && extension? new File([file], `clipboard-${Date.now()}.${extension}`, { type: file.type }) : file;@@ -115,6 +240,10 @@if (file) { event.preventDefault(); submit(file); }};document.addEventListener("paste", paste);- window.addEventListener("pagehide", () => document.removeEventListener("paste", paste), { once: true });- display("");+ // 关闭页面同步停止传输,防止已卸载组件继续收到进度或完成回调。+ window.addEventListener("pagehide", () => {+ invalidate();+ document.removeEventListener("paste", paste);+ }, { once: true });+ display(null);}diff --git a/tests/unittest/test_kit_gradio_upload.cjs b/tests/unittest/test_kit_gradio_upload.cjsindex 234b9e09..d0b4aa51 100644--- a/tests/unittest/test_kit_gradio_upload.cjs+++ b/tests/unittest/test_kit_gradio_upload.cjs@@ -1,4 +1,4 @@-// 通过真实上传控件脚本重放选择、拖放、粘贴及迟到上传,不模拟框架内部组件状态。+// 重放真实上传脚本,仅替换 DOM 和网络边界,覆盖进度、取消、错误及迟到回调。const assert = require("node:assert/strict");const fs = require("node:fs");const vm = require("node:vm");@@ -6,60 +6,192 @@ const crypto = require("node:crypto").webcrypto;const script = fs.readFileSync(require("node:path").join(__dirname, "../../mineru/resources/gradio_upload.js"), "utf8");const handlers = {};const documentHandlers = {};-const input = { value: "", files: [] };-const label = { textContent: "" };-const status = { textContent: "", setAttribute() {} };-const retry = { hidden: true, addEventListener(name, handler) { this[name] = handler; } };-const nodes = { 'input[type="file"]': input, '.mineru-upload-label': label, '.mineru-upload-status': status, '.mineru-upload-retry': retry };-const element = { querySelector: selector => nodes[selector], addEventListener: (name, handler) => handlers[name] = handler };-const uploaded = [];-const pending = [];+const windowHandlers = {};+// 创建最小 DOM 节点,保留属性、显隐和事件语义供生产渲染函数使用。+function makeNode() {+ return {+ textContent: "", hidden: false, style: {}, attributes: {}, events: {}, classes: new Set(),+ // 记录真实属性,尤其是进度条的数值及无障碍名称。+ setAttribute(name, value) { this.attributes[name] = value; },+ // 未知传输总量时移除百分比属性,不能报告虚假的 0%。+ removeAttribute(name) { delete this.attributes[name]; },+ // SVG 使用 hidden 属性而非 HTMLElement 专用属性。+ toggleAttribute(name, value) { if (name === "hidden") this.hidden = value; },+ // 保存事件处理器,以便重放用户交互。+ addEventListener(name, handler) { this.events[name] = handler; },+ // 记录键盘焦点回到上传区域。+ focus() { this.focused = true; },+ };+}+const names = ["target", "file-row", "stem", "extension", "label", "size", "document-icon", "image-icon", "indicator",+ "percent", "complete", "fill", "meter", "remove", "status", "retry"];+const nodes = Object.fromEntries(names.map(name => [name, makeNode()]));+nodes["file-row"].classList = { toggle: (name, value) => value ? nodes["file-row"].classes.add(name) : nodes["file-row"].classes.delete(name) };+const input = Object.assign(makeNode(), {value: "", files: []});+const element = {+ querySelector: selector => selector === 'input[type="file"]' ? input : nodes[selector.replace(".mineru-upload-", "")],+ addEventListener: (name, handler) => { handlers[name] = handler; },+};+const requests = [];+// 模拟 XHR 的公开事件接口,允许主动注入中止后的迟到 progress/load。+class UploadRequest extends EventTarget {+ // 每个请求都有独立的上传事件源和中止状态。+ constructor() { super(); this.upload = new EventTarget(); this.aborted = false; requests.push(this); }+ // 保存目标地址以核对挂载前缀。+ open(method, url) { this.method = method; this.url = url; }+ // 仅捕获 multipart 数据,不执行真实网络传输。+ send(body) { this.file = body.get("files"); }+ // 中止请求按浏览器语义派发 abort。+ abort() { this.aborted = true; this.dispatchEvent(new Event("abort")); }+ // 以实际事件字段驱动生产进度计算。+ progress(loaded, total, lengthComputable = true) {+ this.upload.dispatchEvent(Object.assign(new Event("progress"), {loaded, total, lengthComputable}));+ }+ // 模拟服务端确认或 HTTP 错误,不跳过生产响应解析。+ respond(path, status = 200) {+ this.status = status;+ this.responseText = status === 200 ? JSON.stringify([path]) : path;+ this.dispatchEvent(new Event("load"));+ }+}const values = [];+let clearClicks = 0;const window = {- addEventListener() {},- __mineruI18n: { text: value => value },+ addEventListener: (name, handler) => { windowHandlers[name] = handler; },+ __mineruI18n: {text: value => value},__mineruPdfPreview: {sourceId: "",+ // 同名文件仍以本次选择身份区分。local(file, id) { this.sourceId = id; },- bind(file, id) { return id === this.sourceId; }- }+ // 迟到文件不能绑定当前预览。+ bind(file, id) { return id === this.sourceId; },+ // 原生清除回调使用同一失效入口。+ clear() { this.sourceId = ""; window.__mineruUpload.invalidate(); },+ },+};+const document = {+ addEventListener: (name, handler) => { documentHandlers[name] = handler; },+ removeEventListener: name => { delete documentHandlers[name]; },+ getElementById: name => {+ assert.equal(name, "mineru-kit-clear");+ return {click: () => { clearClicks++; window.__mineruPdfPreview.clear(); }};+ },};-const document = { addEventListener: (name, handler) => documentHandlers[name] = handler, removeEventListener() {} };-const props = { set value(value) { values.push(value); } };-// 只替换传输边界,调用方仍执行生产异步闭包和身份校验。-const upload = file => { uploaded.push(file); return new Promise(resolve => pending.push(resolve)); };-vm.runInNewContext(`(${script})`, { window, document, crypto, setTimeout, File })({element, props, upload, accepted:[".pdf", ".png"], imageExtensions:["png"]});-// 等待控件显式安排的下一次提交,不依赖模拟时钟或固定上传耗时。+const context = {upload_url: "https://example.test/mini/gradio_api/upload", file_url_prefix: "https://example.test/mini/gradio_api/file="};+let contextGate = null;+const server = {upload_context: () => contextGate || Promise.resolve(context)};+const props = {set value(value) { values.push(value); }};+vm.runInNewContext(`(${script})`, {window, document, crypto, setTimeout, clearTimeout, File, FormData, DOMException,+ XMLHttpRequest: UploadRequest})({element, props, server, accepted: [".pdf", ".png"], imageExtensions: ["png"]});+// 等待传输地址和文件桥接的异步边界,不依赖模拟上传速度。const tick = () => new Promise(resolve => setTimeout(resolve, 10));+// 从原生文件选择入口提交文件。+const choose = async file => { input.files = [file]; handlers.change({target: input}); await tick(); };+// 点击实际叉号处理器,验证它会复用全局清除按钮。+const clear = () => nodes.remove.events.click({preventDefault() {}});(async () => {- const first = new File(["first"], "same.pdf");- const second = new File(["second"], "same.pdf");- input.files = [first]; handlers.change({target:input});- const firstId = window.__mineruPdfPreview.sourceId;- handlers.drop({preventDefault(){},dataTransfer:{files:[second]}});- const secondId = window.__mineruPdfPreview.sourceId;- assert.notEqual(firstId, secondId);- pending[0]({path:"/old.pdf",url:"/old.pdf"});+ assert.equal(nodes.target.hidden, false);+ assert.equal(nodes["file-row"].hidden, true);+ await choose(new File([new Uint8Array(10000)], "same.pdf"));+ const first = requests.at(-1);+ assert.equal(first.url, context.upload_url);+ assert.equal(first.withCredentials, true);+ assert.equal(first.file.name, "same.pdf");+ assert.equal(nodes.target.hidden, true);+ assert.equal(nodes.percent.textContent, "0%");+ first.progress(2500, 10000);+ assert.equal(nodes.percent.textContent, "25%");+ assert.equal(nodes.fill.style.width, "25%");+ assert.equal(nodes.size.textContent, "2.5 KB / 10.0 KB");+ first.progress(10000, 10000);+ assert.equal(nodes.status.textContent, "upload_confirming");+ assert.equal(nodes.complete.hidden, true);+ const secondFile = new File([new Uint8Array(20000)], "same.pdf");+ handlers.drop({preventDefault() {}, dataTransfer: {files: [secondFile]}});+ await tick();+ const second = requests.at(-1);+ assert.equal(first.aborted, true);+ first.progress(9000, 10000);+ first.respond("/old.pdf");await tick();- assert.equal(values.some(value=>value.includes("/old.pdf")), false);- pending[1]({path:"/new.pdf",url:"/new.pdf"});+ assert.equal(nodes.percent.textContent, "0%");+ assert.equal(values.some(value => value.includes("/old.pdf")), false);+ second.progress(1, 0, false);+ assert.equal(nodes.percent.hidden, true);+ assert.equal(nodes.meter.attributes["aria-valuenow"], undefined);+ second.respond("/cache/new #1.pdf");await tick();const receipt = values.at(-1);- assert.equal(window.__mineruUpload.bridge(receipt).path,"/new.pdf");- assert.equal(window.__mineruUpload.bridge(receipt).__type__,"update");+ const data = window.__mineruUpload.bridge(receipt);+ assert.equal(data.url, context.file_url_prefix + "/cache/new%20%231.pdf");+ assert.equal(data.size, 20000);+ assert.equal(nodes.complete.hidden, false);+ assert.equal(nodes.size.textContent, "20.0 KB");+ assert.equal(window.__mineruUpload.bridge(receipt).__type__, "update");window.__mineruUpload.prepared("prepare failed");- assert.equal(retry.hidden,false);- retry.click();+ assert.equal(nodes.retry.hidden, false);+ const requestCount = requests.length;+ nodes.retry.events.click();+ await tick();+ assert.equal(requests.length, requestCount);+ assert.equal(JSON.parse(values.at(-1)).file.path, "/cache/new #1.pdf");+ assert.equal(window.__mineruUpload.bridge(receipt).__type__, "update");++ await choose(new File(["file"], '<img src=x onerror=alert(1)>.pdf'));+ assert.equal(nodes.stem.textContent, '<img src=x onerror=alert(1)>');+ const rejected = requests.at(-1);+ rejected.respond("File too large", 413);+ await tick();+ assert.equal(nodes.status.textContent, "File too large");+ assert.equal(nodes.status.attributes.role, "alert");+ assert.equal(nodes.retry.hidden, false);+ nodes.retry.events.click();+ await tick();+ assert.notEqual(requests.at(-1), rejected);+ requests.at(-1).dispatchEvent(new Event("error"));+ await tick();+ assert.equal(nodes.status.textContent, "upload_failed");++ documentHandlers.paste({preventDefault() {}, clipboardData: {files: [], items: [+ {getAsFile: () => new File(["png"], "clipboard", {type: "image/png"})},+ ]}});+ await tick();+ const pasted = requests.at(-1);+ assert.ok(pasted.file.name.endsWith(".png"));+ assert.equal(nodes["image-icon"].hidden, false);+ const beforeClear = values.length;+ clear();+ assert.equal(clearClicks, 1);+ assert.equal(pasted.aborted, true);+ pasted.progress(100, 100);+ pasted.respond("/late.png");+ await tick();+ assert.equal(nodes.target.hidden, false);+ assert.equal(nodes["file-row"].hidden, true);+ assert.equal(values.length, beforeClear);+ assert.equal(window.__mineruUpload.bridge(receipt).__type__, "update");++ let resolveContext;+ contextGate = new Promise(resolve => { resolveContext = resolve; });+ await choose(new File(["pending"], "pending.pdf"));+ const beforeContext = requests.length;+ clear();+ resolveContext(context);+ contextGate = null;await tick();- assert.equal(uploaded.length,2);- assert.equal(JSON.parse(values.at(-1)).file.path,"/new.pdf");- assert.equal(window.__mineruUpload.bridge(receipt).__type__,"update");- documentHandlers.paste({preventDefault(){},clipboardData:{files:[],items:[{getAsFile:()=>new File(["png"],"clipboard",{type:"image/png"})}]}});- assert.ok(uploaded.at(-1).name.endsWith(".png"));- const before = values.length;- window.__mineruUpload.invalidate();- pending[2]({path:"/late.png",url:"/late.png"});+ assert.equal(requests.length, beforeContext);+ window.__mineruUpload.sync({path: "/example.pdf", orig_name: "example.pdf"});+ assert.equal(nodes.size.textContent, "upload_size_unknown");+ window.__mineruUpload.localize();+ assert.equal(nodes.stem.textContent, "example");+ await choose(new File([], "empty.pdf"));+ requests.at(-1).respond("/empty.pdf");await tick();- assert.equal(values.length,before);- console.log("Upload identity, duplicate events, preparation retry, paste and clear passed");-})().catch(error=>{console.error(error);process.exitCode=1;});+ assert.equal(nodes.size.textContent, "0 B");+ await choose(new File(["closing"], "closing.pdf"));+ const closing = requests.at(-1);+ windowHandlers.pagehide();+ assert.equal(closing.aborted, true);+ assert.equal(documentHandlers.paste, undefined);+ console.log("Upload progress, confirmation, replacement, clear/abort, retry, paste, names and late callbacks passed");+})().catch(error => { console.error(error); process.exitCode = 1; });diff --git a/tests/unittest/test_kit_gradio_upload.py b/tests/unittest/test_kit_gradio_upload.pyindex 1ab12ed0..251e1509 100644--- a/tests/unittest/test_kit_gradio_upload.py+++ b/tests/unittest/test_kit_gradio_upload.py@@ -3,10 +3,49 @@from pathlib import Pathimport shutilimport subprocess+from types import SimpleNamespace++import gradio as gr+import pytest+from fastapi import FastAPI+from fastapi.testclient import TestClient++from mineru.kit.gradio.app import build_gradio_app+from mineru.kit.gradio.client import V1ServerCapabilitiesdef test_upload_frontend_lifecycle() -> None:- """运行真实脚本验证同名替换、准备重试、粘贴及清除。"""+ """运行真实脚本验证传输进度、同名替换、重试、粘贴和主动中止。"""node = shutil.which("node")assert node is not Nonesubprocess.run([node, str(Path(__file__).with_suffix(".cjs"))], check=True)++[email protected]("mount", ["", "/mineru"])+def test_upload_context_keeps_mount_authentication_and_size_limit(tmp_path: Path, mount: str) -> None:+ """从真实组件服务获取上传地址,并验证原生路由仍要求登录、限制大小且可读取上传文件。"""+ demo = build_gradio_app(+ SimpleNamespace(),+ V1ServerCapabilities("http://localhost:1", ("flash",), ("zip",), ("file_id",)),+ output_root=tmp_path,+ enable_example=False,+ )+ uploader = next(block for block in demo.blocks.values() if "mineru-upload-file" in (block.elem_classes or []))+ app = gr.mount_gradio_app(FastAPI(), demo, path=mount or "/", auth=("user", "password"), max_file_size=1024)+ body = {"component_id": uploader._id, "fn_name": "upload_context", "session_hash": "upload-test", "data": []}+ with TestClient(app) as client:+ assert client.post(f"{mount}/gradio_api/component_server", json=body).status_code == 401+ assert client.post(f"{mount}/gradio_api/upload", files={"files": ("a.pdf", b"pdf")}).status_code == 401+ assert client.post(f"{mount}/login", data={"username": "user", "password": "password"}).status_code == 200+ response = client.post(f"{mount}/gradio_api/component_server", json=body)+ assert response.status_code == 200, response.text+ context = response.json()+ assert context == {+ "upload_url": f"http://testserver{mount}/gradio_api/upload",+ "file_url_prefix": f"http://testserver{mount}/gradio_api/file=",+ }+ uploaded = client.post(context["upload_url"], files={"files": ("test.pdf", b"%PDF-test")})+ assert uploaded.status_code == 200, uploaded.text+ assert client.get(context["file_url_prefix"] + uploaded.json()[0]).content == b"%PDF-test"+ too_large = client.post(context["upload_url"], files={"files": ("large.pdf", b"x" * 1025)})+ assert too_large.status_code == 413