Skip to content

Transforms complex documents like PDFs and Office docs into LLM-ready markdown/JSON for your Agentic workflows.

feat(webui): refine tier capsule and add default reset

myhlolib033fbac7cbf
diff --git a/mineru/kit/gradio/app.py b/mineru/kit/gradio/app.py
index bc94f674..81e82de0 100644
--- a/mineru/kit/gradio/app.py
+++ b/mineru/kit/gradio/app.py
@@ -445,7 +445,8 @@ def build_gradio_app(
html_template=_resource_text("gradio_tier.html"),
js_on_load=(
f"({_resource_text('gradio_tier.js')})"
- f"({{element, props, trigger, watch, tiers: {json.dumps(tier_choices)}}})"
+ f"({{element, props, trigger, watch, tiers: {json.dumps(tier_choices)}, "
+ f"defaultIndex: {tier_choices.index(preferred_tier)}}})"
),
selected_tier=preferred_tier,
locked=False,
diff --git a/mineru/kit/gradio/i18n.py b/mineru/kit/gradio/i18n.py
index cc4edb03..ed12f9d0 100644
--- a/mineru/kit/gradio/i18n.py
+++ b/mineru/kit/gradio/i18n.py
@@ -53,6 +53,9 @@ MESSAGES: dict[str, tuple[str, str]] = {
"tier_compact_basic": ("basic · medium", "basic · 中"),
"tier_compact_standard": ("standard · high", "standard · 高"),
"tier_compact_advanced": ("advanced · xhigh", "advanced · 极高"),
+ "tier_reset": ("Reset to default: {tier}", "恢复默认等级:{tier}"),
+ "tier_at_default": ("Already at default: {tier}", "已是默认等级:{tier}"),
+ "tier_locked": ("This format uses Flash", "当前格式固定使用 Flash"),
"tier_unavailable_suffix": (" (unavailable on this server)", "(当前服务不可用)"),
"force_ocr": ("Force OCR", "强制 OCR"),
"force_ocr_info": ("Ignore the PDF text layer and perform OCR", "忽略 PDF 文本层并进行 OCR"),
diff --git a/mineru/resources/gradio_tier.css b/mineru/resources/gradio_tier.css
index 9d340d2a..0f85cc06 100644
--- a/mineru/resources/gradio_tier.css
+++ b/mineru/resources/gradio_tier.css
@@ -1,10 +1,10 @@
/* 自有胶囊使用独立选择器,兼容本地 Gradio 和 HF Space 的 CSS 前缀处理。 */
.mineru-tier-control, .mineru-tier-control .html-container { padding: 0 !important; overflow: visible !important; }
.mineru-tier-capsule {
- --tier-position: 0; --tier-knob: 28px; --tier-accent: #316ede;
+ --tier-position: 0; --tier-knob: 30px; --tier-accent: #316ede;
--tier-bg: #fff; --tier-text: #25252a; --tier-muted: #72727c;
--tier-border: #e0e1e6; --tier-track: #e8e9ef; --tier-dot: #b3b6c1; --tier-hover: #edf0f6;
- box-sizing: border-box; padding: 16px 16px 11px; border: 1px solid var(--tier-border); border-radius: 16px;
+ box-sizing: border-box; padding: 14px 18px 12px; border: 1px solid var(--tier-border); border-radius: 18px;
color: var(--tier-text); background: var(--tier-bg); font-family: inherit;
}
.dark .mineru-tier-capsule {
@@ -13,12 +13,16 @@
}
.mineru-tier-capsule[data-tier="advanced"] { --tier-accent: #8952d9; }
.dark .mineru-tier-capsule[data-tier="advanced"] { --tier-accent: #b482fc; }
-.mineru-tier-heading { display: flex; justify-content: space-between; align-items: baseline; gap: 8px; }
-.mineru-tier-title, .mineru-tier-current { font-size: 13px; line-height: 20px; font-weight: 500; }
-.mineru-tier-title { flex-shrink: 0; }
-.mineru-tier-current { color: var(--tier-accent); text-align: right; }
+.mineru-tier-heading { display: grid; grid-template-columns: auto minmax(0, 1fr); align-items: center; gap: 4px; min-height: 36px; }
+.mineru-tier-title, .mineru-tier-current { font-size: 16px; line-height: 24px; font-weight: 500; }
+.mineru-tier-title { white-space: nowrap; }
+.mineru-tier-current { color: var(--tier-accent); text-align: center; white-space: nowrap; }
+.mineru-tier-capsule .mineru-tier-reset { justify-self: end; display: none; place-items: center; width: 36px; height: 36px; min-width: 0; margin: 0; padding: 0; border: 0; border-radius: 9px; box-shadow: none; background: transparent; color: var(--tier-muted); cursor: pointer; }
+.mineru-tier-capsule .mineru-tier-reset:hover:not(:disabled) { color: var(--tier-text); background: var(--tier-hover); }
+.mineru-tier-capsule .mineru-tier-reset:disabled { opacity: 0.45; cursor: default; }
+.mineru-tier-reset svg { display: block; width: 20px; height: 20px; }
.mineru-tier-options[hidden] { display: none !important; }
-.mineru-tier-rail { position: relative; height: 48px; margin-top: 4px; user-select: none; }
+.mineru-tier-rail { position: relative; height: 50px; margin-top: 2px; user-select: none; }
.mineru-tier-track { position: absolute; inset: 15px 0; overflow: hidden; border-radius: 99px; background: var(--tier-track); pointer-events: none; }
.mineru-tier-fill { position: absolute; inset: 0 auto 0 0; width: calc(var(--tier-position) * (100% - var(--tier-knob)) + var(--tier-knob) / 2); background: var(--tier-accent); transition: width 180ms cubic-bezier(.2,.85,.25,1); }
.mineru-tier-capsule[data-tier="advanced"] .mineru-tier-fill { background: linear-gradient(105deg, #3d56d8, #9574ed 55%, #9b66e5); }
@@ -28,20 +32,22 @@
.mineru-tier-dot { width: 6px; height: 6px; margin-inline: -3px; border-radius: 50%; background: var(--tier-dot); }
.mineru-tier-dot[data-passed="true"] { background: #ffffff66; }
.mineru-tier-thumb { position: absolute; top: 50%; left: calc(var(--tier-position) * (100% - var(--tier-knob)) + var(--tier-knob) / 2); width: var(--tier-knob); height: var(--tier-knob); transform: translate(-50%, -50%); border-radius: 50%; background: #fff; box-shadow: 0 2px 7px #00000020; pointer-events: none; transition: left 180ms cubic-bezier(.2,.85,.25,1); }
-.mineru-tier-thumb::after { content: ""; position: absolute; inset: 11px; border-radius: 50%; background: var(--tier-accent); }
+.mineru-tier-thumb::after { content: ""; position: absolute; inset: 12px; border-radius: 50%; background: var(--tier-accent); }
.mineru-tier-capsule.is-dragging .mineru-tier-fill, .mineru-tier-capsule.is-dragging .mineru-tier-thumb { transition: none; }
.mineru-tier-capsule .mineru-tier-range { appearance: none; -webkit-appearance: none; position: absolute; inset: 0; width: 100%; height: 100%; margin: 0; padding: 0; border: 0; border-radius: 99px; background: transparent; cursor: grab; touch-action: pan-y; z-index: 1; box-shadow: none; }
.mineru-tier-range:active { cursor: grabbing; }
.mineru-tier-range::-webkit-slider-runnable-track { height: 100%; background: transparent; border: 0; box-shadow: none; }
-.mineru-tier-range::-webkit-slider-thumb { appearance: none; -webkit-appearance: none; width: var(--tier-knob); height: 48px; background: transparent; border: 0; box-shadow: none; }
+.mineru-tier-range::-webkit-slider-thumb { appearance: none; -webkit-appearance: none; width: var(--tier-knob); height: 50px; background: transparent; border: 0; box-shadow: none; }
.mineru-tier-range::-moz-range-track { height: 100%; background: transparent; border: 0; }
.mineru-tier-range::-moz-range-progress { background: transparent; }
-.mineru-tier-range::-moz-range-thumb { width: var(--tier-knob); height: 48px; background: transparent; border: 0; box-shadow: none; }
-.mineru-tier-choices { display: flex; justify-content: space-between; gap: 2px; margin: -1px -4px 0; }
-.mineru-tier-capsule .mineru-tier-choice { min-width: 0; margin: 0; padding: 5px 4px; border: 0; border-radius: 5px; box-shadow: none; background: transparent; color: var(--tier-muted); font-family: inherit; font-size: 11px; font-weight: 400; line-height: 16px; cursor: pointer; }
-.mineru-tier-capsule .mineru-tier-choice[aria-pressed="true"] { color: var(--tier-text); font-weight: 500; }
-.mineru-tier-capsule .mineru-tier-choice:hover { background: var(--tier-hover); }
-.mineru-tier-range:focus-visible, .mineru-tier-choice:focus-visible { outline: 2px solid var(--tier-accent); outline-offset: 3px; }
+.mineru-tier-range::-moz-range-thumb { width: var(--tier-knob); height: 50px; background: transparent; border: 0; box-shadow: none; }
+.mineru-tier-range:focus-visible, .mineru-tier-reset:focus-visible { outline: 2px solid var(--tier-accent); outline-offset: 3px; }
.mineru-tier-announcement { position: absolute; width: 1px; height: 1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; }
-@media (pointer: coarse) { .mineru-tier-capsule .mineru-tier-choice { min-height: 44px; } }
+@media (pointer: coarse) { .mineru-tier-capsule .mineru-tier-reset { width: 44px; height: 44px; } }
+/* Gradio 会过滤容器查询;由尺寸观察器按控件实际宽度切换,兼容窄桌面侧栏。 */
+.mineru-tier-capsule.is-wide .mineru-tier-heading { grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr); gap: 8px; }
+.mineru-tier-capsule.is-wide .mineru-tier-reset { display: inline-grid; }
+@media (max-width: 420px) {
+ .mineru-tier-capsule { padding-inline: 14px; }
+}
@media (prefers-reduced-motion: reduce) { .mineru-tier-fill, .mineru-tier-thumb { transition: none; } }
diff --git a/mineru/resources/gradio_tier.html b/mineru/resources/gradio_tier.html
index 97f4c8b2..18c5b799 100644
--- a/mineru/resources/gradio_tier.html
+++ b/mineru/resources/gradio_tier.html
@@ -2,6 +2,12 @@
<div class="mineru-tier-heading">
<span class="mineru-tier-title" data-mineru-i18n-key="tier">解析等级</span>
<span class="mineru-tier-current"></span>
+ <button class="mineru-tier-reset" type="button" aria-label="恢复默认等级" disabled>
+ <svg width="20" height="20" 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="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8M3 3v5h5" />
+ </svg>
+ </button>
</div>
<div class="mineru-tier-options">
<div class="mineru-tier-rail">
@@ -10,7 +16,6 @@
<div class="mineru-tier-thumb" aria-hidden="true"></div>
<input class="mineru-tier-range" type="range" min="0" max="1" step="0.001" aria-label="解析等级" />
</div>
- <div class="mineru-tier-choices"></div>
</div>
<output class="mineru-tier-announcement" aria-live="polite"></output>
</div>
diff --git a/mineru/resources/gradio_tier.js b/mineru/resources/gradio_tier.js
index dbb04766..7b00d036 100644
--- a/mineru/resources/gradio_tier.js
+++ b/mineru/resources/gradio_tier.js
@@ -1,25 +1,25 @@
// 胶囊只负责呈现与用户输入;文件锁档、可用档位和会话偏好仍由共享联动事件决定。
-({ element, props, trigger, watch, tiers }) => {
+({ element, props, trigger, watch, tiers, defaultIndex }) => {
const capsule = element.querySelector(".mineru-tier-capsule");
const range = element.querySelector(".mineru-tier-range");
- const choices = element.querySelector(".mineru-tier-choices");
+ const reset = element.querySelector(".mineru-tier-reset");
const dots = element.querySelector(".mineru-tier-dots");
let dragging = false;
let committed = Number(props.value);
let locked = props.locked;
const maximum = tiers.length - 1;
// 词典可能晚于组件挂载;初始化完成后由应用入口统一补齐本地化。
- const text = key => window.__mineruI18n?.text(key) || (key === "tier" ? "解析等级" : "");
+ const text = (key, values = {}) => window.__mineruI18n?.text(key, values) || (key === "tier" ? "解析等级" : "");
// 所有提交值都夹紧为当前服务实际开放的整数档位。
const clamp = value => Math.max(0, Math.min(maximum, Math.round(value)));
- for (const [index, tier] of tiers.entries()) {
- const button = document.createElement("button");
- button.type = "button";
- button.className = "mineru-tier-choice";
- button.dataset.index = String(index);
- button.textContent = tier;
- choices.appendChild(button);
+ // 仅在整行文字与重置按钮都能容纳时显示重置,判断控件宽度而非视口宽度。
+ const resize = () => capsule.classList.toggle("is-wide", capsule.getBoundingClientRect().width >= 340);
+ const resizeObserver = new ResizeObserver(resize);
+ resizeObserver.observe(capsule);
+ resize();
+
+ for (let index = 0; index < tiers.length; index++) {
const dot = document.createElement("span");
dot.className = "mineru-tier-dot";
dots.appendChild(dot);
@@ -39,11 +39,14 @@
range.disabled = disabled;
range.setAttribute("aria-label", text("tier"));
range.setAttribute("aria-valuetext", text(`tier_${tier}`) || tier);
- for (const [i, button] of [...choices.children].entries()) {
- button.disabled = disabled;
- button.setAttribute("aria-pressed", String(!locked && i === index));
- button.setAttribute("aria-label", text(`tier_${tiers[i]}`) || tiers[i]);
- dots.children[i].dataset.passed = String(i <= index);
+ const defaultLabel = text(`tier_compact_${tiers[defaultIndex]}`) || tiers[defaultIndex];
+ const resetLabel = text("tier_reset", { tier: defaultLabel }) || `恢复默认等级:${defaultLabel}`;
+ reset.disabled = disabled || index === defaultIndex;
+ reset.setAttribute("aria-label", resetLabel);
+ reset.setAttribute("title", locked ? text("tier_locked") : index === defaultIndex
+ ? text("tier_at_default", { tier: defaultLabel }) : resetLabel);
+ for (const [i, dot] of [...dots.children].entries()) {
+ dot.dataset.passed = String(i <= index);
}
if (announce) element.querySelector(".mineru-tier-announcement").textContent = text(`tier_${tier}`) || tier;
};
@@ -59,7 +62,7 @@
render(Number(range.value));
};
- // 松手、点击文字和键盘都走同一提交入口,只派发一次用户 input。
+ // 松手、重置和键盘都走同一提交入口,只派发一次用户 input。
const commit = value => {
dragging = false;
capsule.classList.remove("is-dragging");
@@ -94,9 +97,9 @@
event.preventDefault();
commit(values[event.key]);
});
- choices.addEventListener("click", event => {
- const button = event.target.closest(".mineru-tier-choice");
- if (button && !button.disabled) commit(Number(button.dataset.index));
+ // 默认档位由服务端共享选择器注入;锁档时不改写会话的未锁定偏好。
+ reset.addEventListener("click", () => {
+ if (!reset.disabled) commit(defaultIndex);
});
watch(["value", "selected_tier", "locked"], sync);
window.__mineruTier = { localize: sync };
diff --git a/tests/unittest/test_kit_gradio.py b/tests/unittest/test_kit_gradio.py
index 80872c10..30d5db1c 100644
--- a/tests/unittest/test_kit_gradio.py
+++ b/tests/unittest/test_kit_gradio.py
@@ -1235,6 +1235,7 @@ def test_gradio_tier_slider_uses_available_tiers_and_preserves_selection(
assert slider.interactive is (len(tiers) > 1)
assert slider.visible is False
assert label.value == default_position
+ assert f"defaultIndex: {default_position}" in label.js_on_load
assert label.props == {"selected_tier": default_tier, "locked": False}
assert not any(block.__class__.__name__ == "Dropdown" for block in demo.blocks.values())
label_events = [event for event in demo.config["dependencies"] if (label._id, "input") in event["targets"]]
diff --git a/tests/unittest/test_kit_gradio_tier.cjs b/tests/unittest/test_kit_gradio_tier.cjs
index 94290bc6..7d80ed47 100644
--- a/tests/unittest/test_kit_gradio_tier.cjs
+++ b/tests/unittest/test_kit_gradio_tier.cjs
@@ -10,7 +10,7 @@ function node() {
return {
children: [], dataset: {}, attributes: {}, events: {}, value: "0", disabled: false,
style: { setProperty() {} }, classList: { toggle() {}, add() {}, remove() {} },
- // 创建按钮和刻度时保留它们的真实顺序。
+ // 创建刻度时保留它们的真实顺序。
appendChild(child) { this.children.push(child); },
// 记录无障碍标签和当前选中状态。
setAttribute(name, value) { this.attributes[name] = value; },
@@ -18,22 +18,28 @@ function node() {
addEventListener(name, callback) { this.events[name] = callback; },
// 指针捕获在此只记录请求,不模拟浏览器拖动算法。
setPointerCapture(id) { this.capture = id; },
- // 点击目标就是当前按钮,无嵌套元素。
- closest() { return this; },
+ // 单元测试只提供初始宽度,实际尺寸变化由真实浏览器覆盖。
+ getBoundingClientRect() { return { width: 300 }; },
};
}
// 每个控件独立持有 props 和提交记录,模拟 Gradio watch 的输出回执。
-function setup(tiers, position = 0) {
- const nodes = Object.fromEntries(["capsule", "range", "choices", "dots", "title", "current", "options", "announcement"]
+function setup(tiers, position = 0, defaultIndex = position) {
+ const nodes = Object.fromEntries(["capsule", "range", "reset", "dots", "title", "current", "options", "announcement"]
.map(name => [name, node()]));
const props = { value: position, selected_tier: tiers[position], locked: false };
const submissions = [];
- const window = { __mineruI18n: { text: key => key } };
+ // 保留目标档位参数,验证动态按钮说明没有使用当前档位替代默认值。
+ const window = { __mineruI18n: { text: (key, values = {}) => values.tier ? `${key}: ${values.tier}` : key } };
let watcher;
- vm.runInNewContext(`(${script})`, { window, document: { createElement: node } })({
+ // 不模拟浏览器布局,只提供生产脚本所需的尺寸观察接口。
+ class ResizeObserver {
+ // 控件在本测试中不会改变布局,无需触发异步尺寸回调。
+ observe() {}
+ }
+ vm.runInNewContext(`(${script})`, { window, document: { createElement: node }, ResizeObserver })({
element: { querySelector: selector => nodes[selector.replace(".mineru-tier-", "")] },
- props, tiers,
+ props, tiers, defaultIndex,
trigger: event => { submissions.push([event, props.value]); },
watch: (_keys, callback) => { watcher = callback; },
});
@@ -60,6 +66,8 @@ ui.key("End");
ui.key("ArrowRight");
assert.equal(ui.props.value, 3);
assert.equal(ui.submissions.length, 2);
+assert.equal(ui.nodes.reset.disabled, false);
+assert.equal(ui.nodes.reset.attributes["aria-label"], "tier_reset: tier_compact_basic");
// 文件切换中途锁到 Flash,即使迟到的 pointerup/change 也不能写回临时档位。
ui.nodes.range.events.pointerdown({button: 0, pointerId: 8});
@@ -71,9 +79,15 @@ assert.equal(ui.nodes.options.hidden, true);
assert.equal(ui.nodes.current.textContent, "tier_compact_flash");
assert.equal(ui.props.value, 3);
assert.equal(ui.submissions.length, 2);
+assert.equal(ui.nodes.reset.disabled, true);
+assert.equal(ui.nodes.reset.attributes.title, "tier_locked");
+ui.nodes.reset.events.click();
+assert.equal(ui.props.value, 3);
+assert.equal(ui.submissions.length, 2);
ui.update({ locked: false, selected_tier: "advanced" });
assert.equal(ui.nodes.range.value, "3");
assert.equal(ui.nodes.options.hidden, false);
+assert.equal(ui.nodes.reset.disabled, false);
// 页数回执不能打断进行中的拖动;取消指针则恢复已提交值。
ui.nodes.range.events.pointerdown({button: 0, pointerId: 9});
@@ -83,18 +97,43 @@ assert.equal(ui.nodes.range.value, "1.2");
ui.nodes.range.events.pointercancel();
assert.equal(ui.nodes.range.value, "3");
assert.equal(ui.submissions.length, 2);
-ui.nodes.choices.events.click({ target: ui.nodes.choices.children[1] });
+ui.nodes.reset.events.click();
assert.equal(ui.props.value, 1);
-assert.equal(ui.nodes.choices.children[1].attributes["aria-pressed"], "true");
+assert.equal(ui.nodes.reset.disabled, true);
+assert.equal(ui.nodes.reset.attributes.title, "tier_at_default: tier_compact_basic");
+assert.deepEqual(ui.submissions.at(-1), ["input", 1]);
+ui.nodes.reset.events.click();
+assert.equal(ui.submissions.length, 3);
// 缺档和单档只展示实际能力;原生文档的 Flash 不要求存在于公开 PDF 档位中。
for (const tiers of [["standard"], ["basic", "advanced"], ["advanced"]]) {
const subset = setup(tiers);
- assert.deepEqual(subset.nodes.choices.children.map(button => button.textContent), tiers);
+ assert.equal(subset.nodes.dots.children.length, tiers.length);
assert.equal(subset.nodes.options.hidden, tiers.length === 1);
assert.equal(subset.nodes.range.max, String(Math.max(1, tiers.length - 1)));
+ assert.equal(subset.nodes.reset.disabled, true);
subset.update({locked: true, selected_tier: "flash"});
assert.equal(subset.nodes.current.textContent, "tier_compact_flash");
subset.update({locked: false, selected_tier: tiers[0]});
assert.equal(subset.nodes.current.textContent, `tier_compact_${tiers[0]}`);
}
+
+// 重置目标使用服务注入的默认位置,不能写死 Standard 或第一个可用档位。
+for (const [tiers, defaultIndex, selectedIndex] of [
+ [["flash", "basic", "standard", "advanced"], 2, 3],
+ [["flash", "basic", "standard", "advanced"], 1, 3],
+ [["basic", "standard", "advanced"], 1, 0],
+ [["basic", "advanced"], 0, 1],
+ [["flash", "advanced"], 0, 1],
+]) {
+ const resetUi = setup(tiers, selectedIndex, defaultIndex);
+ resetUi.nodes.reset.events.click();
+ assert.equal(resetUi.props.value, defaultIndex);
+ assert.equal(resetUi.nodes.range.value, String(defaultIndex));
+ assert.equal(resetUi.nodes.current.textContent, `tier_compact_${tiers[defaultIndex]}`);
+ assert.deepEqual(resetUi.submissions, [["input", defaultIndex]]);
+ // 无关回执和重复点击不能重复派发,也不能改变服务默认位置。
+ resetUi.update({ value: defaultIndex });
+ resetUi.nodes.reset.events.click();
+ assert.equal(resetUi.submissions.length, 1);
+}