Merge branch 'main' of https://github.com/GaiZhenbiao/ChuanhuChatGPT

ChuanhuChatbot.py

@@ -227,7 +227,7 @@ with gr.Blocks(css=customCSS, theme=small_and_beautiful_theme) as demo:
                         changeProxyBtn = gr.Button("🔄 设置代理地址")
 
     gr.Markdown(description)
-
+    gr.HTML(footer.format(versions=versions_html()), elem_id="footer")
     chatgpt_predict_args = dict(
         fn=predict,
         inputs=[

assets/custom.css

@@ -3,6 +3,21 @@
     --chatbot-color-dark: #121111;
 }
 
+/* 覆盖gradio的页脚信息QAQ */
+footer {
+    display: none !important;
+}
+#footer{
+    text-align: center;
+}
+#footer div{
+    display: inline-block;
+}
+#footer .versions{
+    font-size: 85%;
+    opacity: 0.85;
+}
+
 /* status_display */
 #status_display {
     display: flex;

modules/presets.py

@@ -41,6 +41,10 @@ description = """\
 </div>
 """
 
+footer = """\
+<div class="versions">{versions}</div>
+"""
+
 summarize_prompt = "你是谁？我们刚才聊了什么？"  # 总结对话时的 prompt
 
 MODELS = [

modules/utils.py

@@ -10,6 +10,8 @@ import csv
 import requests
 import re
 import html
+import sys
+import subprocess
 
 import gradio as gr
 from pypinyin import lazy_pinyin
@@ -457,3 +459,45 @@ def get_proxies():
         proxies = None
         
     return proxies
+
+def run(command, desc=None, errdesc=None, custom_env=None, live=False):
+    if desc is not None:
+        print(desc)
+    if live:
+        result = subprocess.run(command, shell=True, env=os.environ if custom_env is None else custom_env)
+        if result.returncode != 0:
+            raise RuntimeError(f"""{errdesc or 'Error running command'}.
+Command: {command}
+Error code: {result.returncode}""")
+
+        return ""
+    result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, env=os.environ if custom_env is None else custom_env)
+    if result.returncode != 0:
+        message = f"""{errdesc or 'Error running command'}.
+Command: {command}
+Error code: {result.returncode}
+stdout: {result.stdout.decode(encoding="utf8", errors="ignore") if len(result.stdout)>0 else '<empty>'}
+stderr: {result.stderr.decode(encoding="utf8", errors="ignore") if len(result.stderr)>0 else '<empty>'}
+"""
+        raise RuntimeError(message)
+    return result.stdout.decode(encoding="utf8", errors="ignore")
+
+def versions_html():
+    git = os.environ.get('GIT', "git")
+    python_version = ".".join([str(x) for x in sys.version_info[0:3]])
+    try:
+        commit_hash = run(f"{git} rev-parse HEAD").strip()
+    except Exception:
+        commit_hash = "<none>"
+    if commit_hash != "<none>":
+        short_commit = commit_hash[0:7]
+        commit_info = f"<a style=\"text-decoration:none\" href=\"https://github.com/GaiZhenbiao/ChuanhuChatGPT/commit/{short_commit}\">{short_commit}</a>"
+    else:
+        commit_info = "unknown \U0001F615"
+    return f"""
+Python: <span title="{sys.version}">{python_version}</span>
+ • 
+Gradio: {gr.__version__}
+ • 
+Commit: {commit_info}
+"""