适配最新的mineru-api，允许设置lang_list和server-url
This commit is contained in:
xunbu committed
1 parent
7afd4c34f1
commit
0182787826
4 files changed
+27
-6
No files matched your search
+16
-1
@@ -460,7 +460,14 @@ class MarkdownWorkflowParams(BaseWorkflowParams):
|
||||
"http://127.0.0.1:8000",
|
||||
description="[仅当 convert_engine='mineru_deploy'] 本地部署的 MinerU 服务地址。",
|
||||
)
|
||||
mineru_deploy_backend: Literal["pipeline", "transformers", "mlx-engine", "vllm-engine", "vllm-async-engine"] = Field(
|
||||
mineru_deploy_backend: Literal[
|
||||
"pipeline",
|
||||
"vlm-transformers",
|
||||
"vlm-mlx-engine",
|
||||
"vlm-vllm-async-engine",
|
||||
"vlm-lmdeploy-engine",
|
||||
"vlm-http-client"
|
||||
] = Field(
|
||||
"pipeline",
|
||||
description="[仅当 convert_engine='mineru_deploy'] 本地部署的 MinerU 服务使用的后端。",
|
||||
)
|
||||
@@ -474,6 +481,12 @@ class MarkdownWorkflowParams(BaseWorkflowParams):
|
||||
mineru_deploy_end_page_id: int = Field(
|
||||
99999, description="[仅当 convert_engine='mineru_deploy'] 结束解析页面。"
|
||||
)
|
||||
mineru_deploy_lang_list: Optional[List[str]] = Field(
|
||||
None, description="[仅当 convert_engine='mineru_deploy' 且 backend='pipeline'] 语言列表。"
|
||||
)
|
||||
mineru_deploy_server_url: Optional[str] = Field(
|
||||
None, description="[仅当 convert_engine='mineru_deploy' 且 backend='vlm-http-client'] Server URL."
|
||||
)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def check_engine_params(self):
|
||||
@@ -1005,6 +1018,8 @@ async def _perform_translation(
|
||||
formula_enable=payload.mineru_deploy_formula_enable,
|
||||
start_page_id=payload.mineru_deploy_start_page_id,
|
||||
end_page_id=payload.mineru_deploy_end_page_id,
|
||||
lang_list=payload.mineru_deploy_lang_list,
|
||||
server_url=payload.mineru_deploy_server_url,
|
||||
)
|
||||
elif payload.convert_engine == "docling" and DOCLING_EXIST:
|
||||
converter_config = ConverterDoclingConfig(
|
||||
|
||||
@@ -17,12 +17,12 @@ from docutranslate.utils.markdown_utils import embed_inline_image_from_zip
|
||||
class ConverterMineruDeployConfig(X2MarkdownConverterConfig):
|
||||
base_url: str = "http://127.0.0.1:8000"
|
||||
output_dir: str = "./output" # 覆盖默认值 ./output
|
||||
# lang_list: list[str] | None = None
|
||||
backend: Literal["pipeline", "transformers", "mlx-engine", "vllm-engine", "vllm-async-engine"] = "pipeline"
|
||||
lang_list: list[Literal["ch", "ch_server", "ch_lite", "en", "korean", "japan", "chinese_cht", "ta", "te", "ka", "th", "el", "latin", "arabic", "east_slavic", "cyrillic", "devanagari"]] | None = None
|
||||
backend: Literal["pipeline", "vlm-transformers", "vlm-mlx-engine", "vlm-vllm-async-engine", "vlm-lmdeploy-engine","vlm-http-client"] = "pipeline"
|
||||
# parse_method: str = "auto"
|
||||
formula_enable: bool = True
|
||||
# table_enable: bool = True
|
||||
# server_url: str | None = None
|
||||
server_url: str | None = None #(Adapted only for vlm-http-client backend)openai compatible server url, e.g., http://127.0.0.1:30000
|
||||
# return_md: bool = True
|
||||
# return_middle_json: bool = True
|
||||
# return_model_output: bool = False
|
||||
|
||||
@@ -71,6 +71,9 @@
|
||||
"mineruDeployBackendMlx": "MLX Engine",
|
||||
"mineruDeployBackendVllm": "VLLM Engine",
|
||||
"mineruDeployBackendVllmAsync": "VLLM Async Engine",
|
||||
"mineruDeployLangListLabel": "语言列表 (Pipeline模式)",
|
||||
"mineruDeployServerUrlLabel": "Server URL",
|
||||
"mineruDeployServerUrlPlaceholder": "例如: http://127.0.0.1:30000",
|
||||
"mineruDeployStartPageLabel": "起始页面",
|
||||
"mineruDeployEndPageLabel": "结束页面",
|
||||
"mineruDeployFormulaEnableLabel": "启用公式解析",
|
||||
@@ -163,7 +166,7 @@
|
||||
"engineOptionDocling": "Docling",
|
||||
"engineOptionMineruDeploy": "Mineru部署服务",
|
||||
"engineOptionMineru_deploy": "Mineru部署服务",
|
||||
"apiHrefInfo302ai": "👈由此链接注册可享受1刀免费额度",
|
||||
"apiHrefInfo302ai": "👈由此链接注册可享受1美元免费额度",
|
||||
"glossaryEmpty": "术语表为空",
|
||||
"status_selectFileFirst": "请先选择文件！",
|
||||
"status_fillRequired": "请填写所有必填项！",
|
||||
@@ -265,6 +268,9 @@
|
||||
"mineruDeployBackendMlx": "MLX Engine",
|
||||
"mineruDeployBackendVllm": "VLLM Engine",
|
||||
"mineruDeployBackendVllmAsync": "VLLM Async Engine",
|
||||
"mineruDeployLangListLabel": "Language List (Pipeline Mode)",
|
||||
"mineruDeployServerUrlLabel": "Server URL",
|
||||
"mineruDeployServerUrlPlaceholder": "e.g., http://127.0.0.1:30000",
|
||||
"mineruDeployStartPageLabel": "Start Page",
|
||||
"mineruDeployEndPageLabel": "End Page",
|
||||
"mineruDeployFormulaEnableLabel": "Enable Formula Parsing",
|
||||
|
||||
@@ -1 +1 @@
|
||||
<!DOCTYPE html>
<html lang="zh-CN" data-bs-theme="auto">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DocuTranslate - 交互式文档翻译</title>
<link rel="icon" href="/static/favicon.ico" type="image/x-icon">
<!-- Bootstrap CSS -->
<link href="/static/bootstrap.css" rel="stylesheet" crossorigin="anonymous">
<!-- Bootstrap Icons -->
<link rel="stylesheet" href="/static/bootstrap-icons.css">
<style>
/* 复用原版 CSS */
body {
background-color: var(--bs-body-bg);
}
button:focus {
outline: none !important;
box-shadow: none !important;
}
.main-container {
display: flex;
flex-direction: column;
height: 100vh;
padding-top: 1rem;
padding-bottom: 1rem;
}
.settings-panel {
height: calc(100vh - 2rem);
overflow-y: auto;
padding-right: 15px;
}
.task-area {
height: calc(100vh - 2rem);
overflow-y: auto;
}
.task-card {
transition: all 0.3s ease-in-out;
}
.log-area {
height: 150px;
background-color: var(--bs-tertiary-bg);
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
font-family: monospace;
font-size: 0.8rem;
padding: 10px;
overflow-y: auto;
white-space: pre-wrap;
word-break: break-all;
}
.log-area-wrapper {
position: relative;
}
.copy-log-btn {
position: absolute;
bottom: 5px;
right: 5px;
z-index: 10;
opacity: 0.5;
transition: all 0.2s ease-in-out;
padding: 0.1rem 0.4rem;
line-height: 1;
}
.copy-log-btn:hover {
opacity: 1;
}
.file-drop-area {
border: 2px dashed var(--bs-secondary-bg);
border-radius: .375rem;
padding: 2rem;
text-align: center;
cursor: pointer;
transition: all 0.2s ease-in-out;
background-color: var(--bs-body-bg);
}
.file-drop-area.drag-over {
border-color: var(--bs-primary);
background-color: var(--bs-secondary-bg);
}
.file-drop-area.file-selected {
border-style: solid;
border-color: var(--bs-success);
background-color: var(--bs-success-bg-subtle);
}
.file-drop-area.input-error {
border-color: var(--bs-danger);
}
#previewOffcanvas {
--bs-offcanvas-width: 95vw;
max-width: 1600px;
}
.preview-split-container {
display: flex;
flex-direction: row;
height: 90%;
}
.preview-pane-wrapper {
display: flex;
flex-direction: column;
overflow: hidden;
width: 100%;
height: 100%;
}
.preview-pane-wrapper .preview-pane {
flex-grow: 1;
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
overflow: auto;
position: relative;
}
.gutter {
background-color: var(--bs-tertiary-bg);
background-repeat: no-repeat;
background-position: 50%;
}
.gutter.gutter-horizontal {
cursor: col-resize;
border-left: 1px solid var(--bs-border-color);
border-right: 1px solid var(--bs-border-color);
}
.gutter.gutter-vertical {
cursor: row-resize;
border-top: 1px solid var(--bs-border-color);
border-bottom: 1px solid var(--bs-border-color);
}
.preview-pane iframe {
width: 100%;
height: 100%;
border: none;
}
.preview-pane pre {
margin: 0;
padding: 1rem;
background-color: var(--bs-body-bg);
white-space: pre;
}
.bottom-left-controls {
position: fixed;
bottom: 1rem;
left: 1rem;
z-index: 1050;
display: flex;
gap: 0.5rem;
}
.step-number {
margin-right: 0.25rem;
}
#translatedPreviewContainer .preview-pane {
overflow: hidden;
}
#translatedPreviewContainer .preview-pane iframe {
display: block;
width: 100%;
height: 100%;
}
@media (max-width: 991.98px) {
.main-container {
height: auto;
padding-bottom: 6rem;
}
.settings-panel, .task-area {
Line truncated
|
||||
<!DOCTYPE html>
<html lang="zh-CN" data-bs-theme="auto">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DocuTranslate - 交互式文档翻译</title>
<link rel="icon" href="/static/favicon.ico" type="image/x-icon">
<!-- Bootstrap CSS -->
<link href="/static/bootstrap.css" rel="stylesheet" crossorigin="anonymous">
<!-- Bootstrap Icons -->
<link rel="stylesheet" href="/static/bootstrap-icons.css">
<style>
/* 复用原版 CSS */
body {
background-color: var(--bs-body-bg);
}
button:focus {
outline: none !important;
box-shadow: none !important;
}
.main-container {
display: flex;
flex-direction: column;
height: 100vh;
padding-top: 1rem;
padding-bottom: 1rem;
}
.settings-panel {
height: calc(100vh - 2rem);
overflow-y: auto;
padding-right: 15px;
}
.task-area {
height: calc(100vh - 2rem);
overflow-y: auto;
}
.task-card {
transition: all 0.3s ease-in-out;
}
.log-area {
height: 150px;
background-color: var(--bs-tertiary-bg);
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
font-family: monospace;
font-size: 0.8rem;
padding: 10px;
overflow-y: auto;
white-space: pre-wrap;
word-break: break-all;
}
.log-area-wrapper {
position: relative;
}
.copy-log-btn {
position: absolute;
bottom: 5px;
right: 5px;
z-index: 10;
opacity: 0.5;
transition: all 0.2s ease-in-out;
padding: 0.1rem 0.4rem;
line-height: 1;
}
.copy-log-btn:hover {
opacity: 1;
}
.file-drop-area {
border: 2px dashed var(--bs-secondary-bg);
border-radius: .375rem;
padding: 2rem;
text-align: center;
cursor: pointer;
transition: all 0.2s ease-in-out;
background-color: var(--bs-body-bg);
}
.file-drop-area.drag-over {
border-color: var(--bs-primary);
background-color: var(--bs-secondary-bg);
}
.file-drop-area.file-selected {
border-style: solid;
border-color: var(--bs-success);
background-color: var(--bs-success-bg-subtle);
}
.file-drop-area.input-error {
border-color: var(--bs-danger);
}
#previewOffcanvas {
--bs-offcanvas-width: 95vw;
max-width: 1600px;
}
.preview-split-container {
display: flex;
flex-direction: row;
height: 90%;
}
.preview-pane-wrapper {
display: flex;
flex-direction: column;
overflow: hidden;
width: 100%;
height: 100%;
}
.preview-pane-wrapper .preview-pane {
flex-grow: 1;
border: 1px solid var(--bs-border-color);
border-radius: .375rem;
overflow: auto;
position: relative;
}
.gutter {
background-color: var(--bs-tertiary-bg);
background-repeat: no-repeat;
background-position: 50%;
}
.gutter.gutter-horizontal {
cursor: col-resize;
border-left: 1px solid var(--bs-border-color);
border-right: 1px solid var(--bs-border-color);
}
.gutter.gutter-vertical {
cursor: row-resize;
border-top: 1px solid var(--bs-border-color);
border-bottom: 1px solid var(--bs-border-color);
}
.preview-pane iframe {
width: 100%;
height: 100%;
border: none;
}
.preview-pane pre {
margin: 0;
padding: 1rem;
background-color: var(--bs-body-bg);
white-space: pre;
}
.bottom-left-controls {
position: fixed;
bottom: 1rem;
left: 1rem;
z-index: 1050;
display: flex;
gap: 0.5rem;
}
.step-number {
margin-right: 0.25rem;
}
#translatedPreviewContainer .preview-pane {
overflow: hidden;
}
#translatedPreviewContainer .preview-pane iframe {
display: block;
width: 100%;
height: 100%;
}
.lang-list-container {
max-height: 200px;
overflow-y: auto;
border: 1px solid var(--bs-border-color);
border-radius: 0.375rem;
paddinLine truncated
|
||||
Reference in new issue
Block a user