Update utils.py

utils.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import json
 import os
@@ -13,7 +14,8 @@ from markdown import markdown
 from pygments import highlight
 from pygments.lexers import get_lexer_by_name
 from pygments.formatters import HtmlFormatter
-from theme_dropdown import create_theme_dropdown  # noqa: F401
+from theme_dropdown import create_theme_dropdown  
+from gradio.themes.utils import ThemeAsset
 
     
 use_websearch_checkbox=False
@@ -59,6 +61,28 @@ The default model role of the app is the original assistant of ChatGPT, but you
         
 MODELS = ["gpt-3.5-turbo", "gpt-3.5-turbo-0301",]  
 
+
+
+def postprocess(
+    self, y: List[Tuple[str | None, str | None]]
+) -> List[Tuple[str | None, str | None]]:
+    """
+    Parameters:
+        y: List of tuples representing the message and response pairs. Each message and response should be a string, which may be in Markdown format.
+    Returns:
+        List of tuples representing the message and response. Each message and response will be a string of HTML.
+    """
+    if y is None:
+        return []
+    for i, (message, response) in enumerate(y):
+        y[i] = (
+            # None if message is None else markdown.markdown(message),
+            # None if response is None else markdown.markdown(response),
+            None if message is None else message,
+            None if response is None else mdtex2html.convert(response),
+        )
+    return y
+
 if TYPE_CHECKING:
     from typing import TypedDict
 
@@ -73,7 +97,6 @@ def count_token(message):
     length = len(encoding.encode(input_str))
     return length
 
-
 def markdown_to_html_with_syntax_highlight(md_str):
     def replacer(match):
         lang = match.group(1) or "text"
@@ -95,7 +118,6 @@ def markdown_to_html_with_syntax_highlight(md_str):
     html_str = markdown(md_str)
     return html_str
 
-
 def normalize_markdown(md_text: str) -> str:
     lines = md_text.split("\n")
     normalized_lines = []
@@ -119,24 +141,6 @@ def normalize_markdown(md_text: str) -> str:
 
     return "\n".join(normalized_lines)
 
-def postprocess(
-    self, y: List[Tuple[str | None, str | None]]
-) -> List[Tuple[str | None, str | None]]:
-    """
-    Parameters:
-        y: List of tuples representing the message and response pairs. Each message and response should be a string, which may be in Markdown format.
-    Returns:
-        List of tuples representing the message and response. Each message and response will be a string of HTML.
-    """
-    if y is None or y == []:
-        return []
-    tag_regex = re.compile(r"^<\w+>[^<]+</\w+>")
-    if tag_regex.search(y[-1][1]):
-        y[-1] = (convert_user(y[-1][0]), y[-1][1])
-    else:
-        y[-1] = (convert_user(y[-1][0]), convert_mdtext(y[-1][1]))
-    return y
-
 def convert_mdtext(md_text):
     code_block_pattern = re.compile(r"```(.*?)(?:```|$)", re.DOTALL)
     inline_code_pattern = re.compile(r"`(.*?)`", re.DOTALL)
@@ -183,7 +187,6 @@ def construct_assistant(text):
 def construct_token_message(token, stream=False):
     return f"Token count: {token}"
 
-
 def save_file(filename, system, history, chatbot):
     logging.info("saving......")
     os.makedirs(HISTORY_DIR, exist_ok=True)
@@ -200,7 +203,6 @@ def save_file(filename, system, history, chatbot):
             f.write(md_s)
     return os.path.join(HISTORY_DIR, filename)
 
-
 def save_chat_history(filename, system, history, chatbot):
     if filename == "":
         return
@@ -208,7 +210,6 @@ def save_chat_history(filename, system, history, chatbot):
         filename += ".json"
     return save_file(filename, system, history, chatbot)
 
-
 def export_markdown(filename, system, history, chatbot):
     if filename == "":
         return
@@ -216,7 +217,6 @@ def export_markdown(filename, system, history, chatbot):
         filename += ".md"
     return save_file(filename, system, history, chatbot)
 
-
 def load_chat_history(filename, system, history, chatbot):
     if type(filename) != str:
         filename = filename.name
@@ -239,7 +239,6 @@ def load_chat_history(filename, system, history, chatbot):
     except FileNotFoundError:
         return filename, system, history, chatbot
 
-
 def load_template(filename, mode=0):
     lines = []
     logging.info("Loading template...")
@@ -265,7 +264,6 @@ def load_template(filename, mode=0):
 def sorted_by_pinyin(list):
     return sorted(list, key=lambda char: lazy_pinyin(char)[0][0])
 
-
 def get_template_content(templates, selection, original_system_prompt):
     logging.info(f"Prompt:  {selection}")
     try:
@@ -273,16 +271,13 @@ def get_template_content(templates, selection, original_system_prompt):
     except:
         return original_system_prompt
 
-
 def reset_state():
     logging.info("Reset")
     return [], [], [], construct_token_message(0)
 
-
 def reset_textbox():
     return gr.update(value="")
 
-
 def hide_middle_chars(s):
     if len(s) <= 8:
         return s
@@ -297,3 +292,57 @@ def submit_key(key):
     msg = f"API-Key: {hide_middle_chars(key)}"
     logging.info(msg)
     return key, msg
+
+
+def create_theme_dropdown():
+    import gradio as gr
+
+    asset_path = pathlib.Path(__file__).parent / "themes"
+    themes = []
+    for theme_asset in os.listdir(str(asset_path)):
+        themes.append(
+            (ThemeAsset(theme_asset), gr.Theme.load(str(asset_path / theme_asset)))
+        )
+
+    def make_else_if(theme_asset):
+        return f"""
+        else if (theme == '{str(theme_asset[0].version)}') {{
+            var theme_css = `{theme_asset[1]._get_theme_css()}`
+        }}"""
+
+    head, tail = themes[0], themes[1:]
+    if_statement = f"""
+        if (theme == "{str(head[0].version)}") {{
+            var theme_css = `{head[1]._get_theme_css()}`
+        }} {" ".join(make_else_if(t) for t in tail)}
+    """
+
+    latest_to_oldest = sorted([t[0] for t in themes], key=lambda asset: asset.version)[
+        ::-1
+    ]
+    latest_to_oldest = [str(t.version) for t in latest_to_oldest]
+
+    component = gr.Dropdown(
+        choices=latest_to_oldest,
+        value=latest_to_oldest[0],
+        render=False,
+        label="Select Version",
+    ).style(container=False)
+
+    return (
+        component,
+        f"""
+        (theme) => {{
+            if (!document.querySelector('.theme-css')) {{
+                var theme_elem = document.createElement('style');
+                theme_elem.classList.add('theme-css');
+                document.head.appendChild(theme_elem);
+            }} else {{
+                var theme_elem = document.querySelector('.theme-css');
+            }}
+            {if_statement}
+            theme_elem.innerHTML = theme_css;
+        }}
+    """,
+    )
+