From 286e06f25baae511937a92c2687b0cff8d3ccdfe Mon Sep 17 00:00:00 2001 From: Wenjie Zhang Date: Mon, 23 Jun 2025 10:32:01 +0800 Subject: [PATCH] style: ruff check fix --- pyproject.toml | 2 +- server/routers/base_router.py | 6 +++--- src/core/knowledgebase.py | 2 +- src/plugins/mineru.py | 6 ++++-- src/utils/logging_config.py | 21 +++++++++++---------- web/src/stores/info.js | 2 +- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dd108932..111add48 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ dependencies = [ "zhipuai>=2.1.5.20250421", ] [tool.ruff] -line-length = 140 # 代码最大行宽 +line-length = 210 # 代码最大行宽 lint.select = [ # 选择的规则 "F", "E", diff --git a/server/routers/base_router.py b/server/routers/base_router.py index 616c973e..4d2b6000 100644 --- a/server/routers/base_router.py +++ b/server/routers/base_router.py @@ -24,7 +24,7 @@ def load_info_config(): return get_default_info_config() # 读取配置文件 - with open(config_path, 'r', encoding='utf-8') as file: + with open(config_path, encoding='utf-8') as file: config = yaml.safe_load(file) # logger.info(f"成功加载信息配置文件: {config_path}") @@ -38,7 +38,7 @@ def get_default_info_config(): """获取默认信息配置""" return { "organization": { - "name": "江南大学", + "name": "江南语析", "short_name": "语析", "logo": "/favicon.svg", "avatar": "/avatar.jpg" @@ -54,7 +54,7 @@ def get_default_info_config(): "🤖 多模型支持" ], "footer": { - "copyright": "© 江南大学 2025 [WIP] v0.12.138" + "copyright": "© 江南语析 2025 [WIP] v0.12.138" } } diff --git a/src/core/knowledgebase.py b/src/core/knowledgebase.py index 3676e812..118aa06f 100644 --- a/src/core/knowledgebase.py +++ b/src/core/knowledgebase.py @@ -582,7 +582,7 @@ class KnowledgeBase: for field in ["text", "file_id", "hash", "start_char_idx", "end_char_idx"]: try: item_dict["entity"][field] = getattr(entity_data, field, None) - except: + except Exception: continue all_db_result_dicts.append(item_dict) diff --git a/src/plugins/mineru.py b/src/plugins/mineru.py index 9edc0133..724cc350 100644 --- a/src/plugins/mineru.py +++ b/src/plugins/mineru.py @@ -45,7 +45,9 @@ def do_parse( new_pdf_bytes = convert_pdf_bytes_to_bytes_by_pypdfium2(pdf_bytes, start_page_id, end_page_id) pdf_bytes_list[idx] = new_pdf_bytes - infer_results, all_image_lists, all_pdf_docs, lang_list, ocr_enabled_list = pipeline_doc_analyze(pdf_bytes_list, p_lang_list, parse_method=parse_method, formula_enable=p_formula_enable,table_enable=p_table_enable) + + result = pipeline_doc_analyze(pdf_bytes_list, p_lang_list, parse_method=parse_method, formula_enable=p_formula_enable,table_enable=p_table_enable) + infer_results, all_image_lists, all_pdf_docs, lang_list, ocr_enabled_list = result md_results = [] @@ -244,4 +246,4 @@ if __name__ == "__main__": if doc_path.suffix in pdf_suffixes + image_suffixes: doc_path_list.append(doc_path) - parse_doc(doc_path_list, output_dir, backend="vlm-sglang-client", server_url="http://172.19.13.5:30000") # faster(client). \ No newline at end of file + parse_doc(doc_path_list, output_dir, backend="vlm-sglang-client", server_url="http://172.19.13.5:30000") # faster(client). diff --git a/src/utils/logging_config.py b/src/utils/logging_config.py index 376564f7..d86dfa9c 100644 --- a/src/utils/logging_config.py +++ b/src/utils/logging_config.py @@ -1,10 +1,9 @@ -import logging import os from datetime import datetime import pytz -from loguru import logger +from loguru import logger as loguru_logger DATETIME = datetime.now(pytz.timezone('Asia/Shanghai')).strftime('%Y-%m-%d-%H%M%S') # DATETIME = "debug" # 为了方便，调试的时候输出到 debug.log 文件 @@ -12,12 +11,12 @@ LOG_FILE = f'saves/log/project-{DATETIME}.log' def setup_logger(name, level="DEBUG", console=True): """使用 loguru 设置日志记录器""" os.makedirs("saves/log", exist_ok=True) - + # 移除默认的 handler - logger.remove() - + loguru_logger.remove() + # 添加文件日志（无颜色） - logger.add( + loguru_logger.add( LOG_FILE, level=level, format="{time:YYYY-MM-DD HH:mm:ss} - {level} - {name} - {message}", @@ -26,21 +25,23 @@ def setup_logger(name, level="DEBUG", console=True): retention="30 days", # 保留30天的日志 compression="zip" # 压缩旧日志文件 ) - + # 添加控制台日志（有颜色） if console: - logger.add( + loguru_logger.add( lambda msg: print(msg, end=""), level=level, format="{time:YYYY-MM-DD HH:mm:ss} - {level} - {name} - {message}", colorize=True ) - - return logger + + return loguru_logger # 设置根日志记录器 logger = setup_logger('Yuxi') +__all__ = ['logger'] + # If you want to disable logging from external libraries # logging.getLogger('some_external_library').setLevel(logging.CRITICAL) diff --git a/web/src/stores/info.js b/web/src/stores/info.js index 7c14115b..5e5b8da3 100644 --- a/web/src/stores/info.js +++ b/web/src/stores/info.js @@ -32,7 +32,7 @@ export const useInfoStore = defineStore('info', () => { // 计算属性 - 页脚信息 const footer = computed(() => infoConfig.value.footer || { - copyright: "© 江南大学 2025 [WIP] v0.12.138" + copyright: "© 江南语析 2025 [WIP] v0.12.138" }) // 动作方法