修复转换markdown时部分日志未显示、不使用markdown解析引擎时出现的问题

docutranslate/app.py

@@ -441,10 +441,11 @@ async def _perform_translation(
             )
             converter_config = None
             if payload.convert_engine == 'mineru':
-                converter_config = ConverterMineruConfig(mineru_token=payload.mineru_token,
+                converter_config = ConverterMineruConfig(logger=task_logger, mineru_token=payload.mineru_token,
                                                          formula_ocr=payload.formula_ocr)
             elif payload.convert_engine == 'docling' and DOCLING_EXIST:
-                converter_config = ConverterDoclingConfig(code_ocr=payload.code_ocr, formula_ocr=payload.formula_ocr)
+                converter_config = ConverterDoclingConfig(logger=task_logger, code_ocr=payload.code_ocr,
+                                                          formula_ocr=payload.formula_ocr)
             html_exporter_config = MD2HTMLExporterConfig(cdn=True)
             workflow_config = MarkdownBasedWorkflowConfig(
                 convert_engine=payload.convert_engine, converter_config=converter_config,

docutranslate/cacher/md_based_convert_cacher.py

@@ -13,8 +13,13 @@ class MDBasedCovertCacher:
         self.cache_dict = OrderedDict()
 
     @staticmethod
-    def _get_hashcode(document: Document, convert_engin: str, convert_config: ConverterConfig) -> str:
+    def _get_hashcode(document: Document, convert_engin: str, convert_config: ConverterConfig|None) -> str:
-        obj = (document.suffix, document.content, convert_engin, convert_config.gethash())
+        if convert_config :
+            convert_config_hash=convert_config.gethash()
+        else:
+            convert_config_hash=None
+
+        obj = (document.suffix, document.content, convert_engin, convert_config_hash)
         return str(hash(obj))
 
     def get_cached_result(self, document: Document, convert_engin: str,

docutranslate/converter/base.py

@@ -10,16 +10,19 @@ from docutranslate.logger import global_logger
 @dataclass(kw_only=True)
 class ConverterConfig(ABC):
     logger: Logger | None = None
-    @abstractmethod
-    def gethash(self)->Hashable:
-        ...
 
+    @abstractmethod
+    def gethash(self) -> Hashable:
+        ...
 
 
 class Converter(ABC):
     def __init__(self, config: ConverterConfig | None = None):
         self.config = config
-        self.logger = config.logger or global_logger
+        if config:
+            self.logger = config.logger or global_logger
+        else:
+            self.logger = global_logger
 
     @abstractmethod
     def convert(self, document: Document) -> Document:

docutranslate/converter/x2md/converter_mineru.py

@@ -37,11 +37,10 @@ client_async = httpx.AsyncClient(trust_env=False, timeout=timeout, proxy=None, v
 
 
 class ConverterMineru(X2MarkdownConverter):
-    def __init__(self, config: ConverterMineruConfig, logger: Logger = global_logger):
+    def __init__(self, config: ConverterMineruConfig):
         super().__init__(config=config)
         self.mineru_token = config.mineru_token.strip()
         self.formula = config.formula_ocr
-        self.logger = logger
 
     def _get_header(self):
         return {

docutranslate/static/index.html

@@ -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>
        body {
            background-color: var(--bs-body-bg);
        }

        .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; /* for scrollbar */
        }

        .task-area {
            height: calc(100vh - 2rem);
            overflow-y: auto;
        }

        .task-card {
            transition: all 0.3s ease-in-out;
        }

        .task-id-placeholder {
            color: var(--bs-secondary-color);
            font-style: italic;
        }

        .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;
        }

        .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);
        }

        .file-name-display.input-error-text {
            color: var(--bs-danger);
            font-weight: bold;
        }

        #printFrame, #translatedPreviewFrame {
            border: none;
            width: 100%;
        }

        #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; /* Important for split.js */
        }

        .preview-pane-wrapper h6 {
            flex-shrink: 0;
            padding: 0.25rem;
        }

        .preview-pane-wrapper .preview-pane {
            flex-grow: 1; /* Make the inner pane grow */
            border: 1px solid var(--bs-border-color);
            border-radius: .375rem;
            overflow: auto;
        }

        .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, .preview-pane pre {
            width: 100%;
            height: 95%;
            border: none;
            margin: 0;
            padding: 0;
            overflow: auto;
            background-color: var(--bs-body-bg);
        }

        .slider-reset-btn {
            visibility: hidden;
        }

        .theme-switch {
            position: fixed;
            bottom: 1rem;
            left: 1rem;
            z-index: 1050;
        }

        @media (max-width: 991.98px) {
            .main-container {
                height: auto;
                padding-bottom: 6rem;
            }

            .settings-panel, .task-area {
                height: auto;
                overflow-y: visible;
            }

            .settings-panel {
                padding-right: 0;
                margin-bottom: 2rem;
            }
        }

        @media (max-width: 767.98px) {
            .task-card .col-md-7 {
                margin-top: 1.5rem;
            }

            #previewOffcanvas {
                --bs-offcanvas-width: 100vw;
            }
        }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>
        body {
            background-color: var(--bs-body-bg);
        }

        .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; /* for scrollbar */
        }

        .task-area {
            height: calc(100vh - 2rem);
            overflow-y: auto;
        }

        .task-card {
            transition: all 0.3s ease-in-out;
        }

        .task-id-placeholder {
            color: var(--bs-secondary-color);
            font-style: italic;
        }

        .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;
        }

        .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);
        }

        .file-name-display.input-error-text {
            color: var(--bs-danger);
            font-weight: bold;
        }

        #printFrame, #translatedPreviewFrame {
            border: none;
            width: 100%;
        }

        #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; /* Important for split.js */
        }

        .preview-pane-wrapper h6 {
            flex-shrink: 0;
            padding: 0.25rem;
        }

        .preview-pane-wrapper .preview-pane {
            flex-grow: 1; /* Make the inner pane grow */
            border: 1px solid var(--bs-border-color);
            border-radius: .375rem;
            overflow: auto;
        }

        .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, .preview-pane pre {
            width: 100%;
            height: 95%;
            border: none;
            margin: 0;
            padding: 0;
            overflow: auto;
            background-color: var(--bs-body-bg);
        }

        .slider-reset-btn {
            visibility: hidden;
        }

        .theme-switch {
            position: fixed;
            bottom: 1rem;
            left: 1rem;
            z-index: 1050;
        }

        @media (max-width: 991.98px) {
            .main-container {
                height: auto;
                padding-bottom: 6rem;
            }

            .settings-panel, .task-area {
                height: auto;
                overflow-y: visible;
            }

            .settings-panel {
                padding-right: 0;
                margin-bottom: 2rem;
            }
        }

        @media (max-width: 767.98px) {
            .task-card .col-md-7 {
                margin-top: 1.5rem;
            }

            #previewOffcanvas {
                --bs-offcanvas-width: 100vw;
            }
        }Line truncated