From 02b6f26b05f47751b5f8efe6e88afcd44c262c0b Mon Sep 17 00:00:00 2001 From: OREEkE Date: Thu, 11 Apr 2024 14:15:12 +0800 Subject: [PATCH] remove logging in gradios.py (#1699) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 如果初始主题是HF社区主题,这里使用logging会导致程序不再写入日志(包括对话内容在内的任何记录),下载主题的日志输出和程序启动时的日志初始化有冲突。 --- themes/gradios.py | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/themes/gradios.py b/themes/gradios.py index 14d88a2..d72e7e8 100644 --- a/themes/gradios.py +++ b/themes/gradios.py @@ -1,4 +1,3 @@ -import logging import os import gradio as gr from toolbox import get_conf, ProxyNetworkActivate @@ -10,12 +9,15 @@ theme_dir = os.path.dirname(__file__) def dynamic_set_theme(THEME): set_theme = gr.themes.ThemeClass() with ProxyNetworkActivate("Download_Gradio_Theme"): - logging.info("正在下载Gradio主题,请稍等。") - if THEME.startswith("Huggingface-"): - THEME = THEME.lstrip("Huggingface-") - if THEME.startswith("huggingface-"): - THEME = THEME.lstrip("huggingface-") - set_theme = set_theme.from_hub(THEME.lower()) + print("正在下载Gradio主题,请稍等。") + try: + if THEME.startswith("Huggingface-"): + THEME = THEME.lstrip("Huggingface-") + if THEME.startswith("huggingface-"): + THEME = THEME.lstrip("huggingface-") + set_theme = set_theme.from_hub(THEME.lower()) + except: + print("下载Gradio主题时出现异常。") return set_theme @@ -23,13 +25,16 @@ def adjust_theme(): try: set_theme = gr.themes.ThemeClass() with ProxyNetworkActivate("Download_Gradio_Theme"): - logging.info("正在下载Gradio主题,请稍等。") - THEME = get_conf("THEME") - if THEME.startswith("Huggingface-"): - THEME = THEME.lstrip("Huggingface-") - if THEME.startswith("huggingface-"): - THEME = THEME.lstrip("huggingface-") - set_theme = set_theme.from_hub(THEME.lower()) + print("正在下载Gradio主题,请稍等。") + try: + THEME = get_conf("THEME") + if THEME.startswith("Huggingface-"): + THEME = THEME.lstrip("Huggingface-") + if THEME.startswith("huggingface-"): + THEME = THEME.lstrip("huggingface-") + set_theme = set_theme.from_hub(THEME.lower()) + except: + print("下载Gradio主题时出现异常。") from themes.common import get_common_html_javascript_code js = get_common_html_javascript_code() @@ -49,9 +54,7 @@ def adjust_theme(): ) except Exception: set_theme = None - from toolbox import trimmed_format_exc - - logging.error("gradio版本较旧, 不能自定义字体和颜色:", trimmed_format_exc()) + print("gradio版本较旧, 不能自定义字体和颜色。") return set_theme