update gr

themes/gradios.py

@@ -2,30 +2,44 @@ import logging
 import os
 import gradio as gr
 from toolbox import get_conf, ProxyNetworkActivate
-CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf('CODE_HIGHLIGHT', 'ADD_WAIFU', 'LAYOUT')
+
+CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf("CODE_HIGHLIGHT", "ADD_WAIFU", "LAYOUT")
 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-')
+    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())
     return set_theme
 
+
 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-')
+        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())
 
-        with open(os.path.join(theme_dir, 'common.js'), 'r', encoding='utf8') as f: 
-            js = f"<script>{f.read()}</script>"
+        js = ""
+        for jsf in [
+            os.path.join(theme_dir, "common.js"),
+            os.path.join(theme_dir, "mermaid.min.js"),
+            os.path.join(theme_dir, "mermaid_loader.js"),
+        ]:
+            with open(jsf, "r", encoding="utf8") as f:
+                js += f"<script>{f.read()}</script>"
+
 
         # 添加一个萌萌的看板娘
         if ADD_WAIFU:
@@ -34,20 +48,26 @@ def adjust_theme():
                 <script src="file=docs/waifu_plugin/jquery-ui.min.js"></script>
                 <script src="file=docs/waifu_plugin/autoload.js"></script>
             """
-        if not hasattr(gr, 'RawTemplateResponse'):
+        if not hasattr(gr, "RawTemplateResponse"):
             gr.RawTemplateResponse = gr.routes.templates.TemplateResponse
         gradio_original_template_fn = gr.RawTemplateResponse
+
         def gradio_new_template_fn(*args, **kwargs):
             res = gradio_original_template_fn(*args, **kwargs)
-            res.body = res.body.replace(b'</html>', f'{js}</html>'.encode("utf8"))
+            res.body = res.body.replace(b"</html>", f"{js}</html>".encode("utf8"))
             res.init_headers()
             return res
-        gr.routes.templates.TemplateResponse = gradio_new_template_fn   # override gradio template
-    except Exception as e:
+
+        gr.routes.templates.TemplateResponse = (
+            gradio_new_template_fn  # override gradio template
+        )
+    except Exception:
         set_theme = None
         from toolbox import trimmed_format_exc
-        logging.error('gradio版本较旧, 不能自定义字体和颜色:', trimmed_format_exc())
+
+        logging.error("gradio版本较旧, 不能自定义字体和颜色:", trimmed_format_exc())
     return set_theme
 
-with open(os.path.join(theme_dir, 'common.css'), "r", encoding="utf-8") as f:
+
+with open(os.path.join(theme_dir, "common.css"), "r", encoding="utf-8") as f:
     advanced_css = f.read()