Upload 22 files

README.md

@@ -1,10 +1,10 @@
 ---
 title: ChuanhuChatGPT
-emoji: 🐯
+emoji: 🐠
 colorFrom: blue
 colorTo: red
 sdk: gradio
-sdk_version: 3.22.1
+sdk_version: 3.23.0
 app_file: app.py
 pinned: false
 license: gpl-3.0

app.py

@@ -434,6 +434,7 @@ logging.info(
 demo.title = "川虎ChatGPT 🚀"
 
 if __name__ == "__main__":
+    reload_javascript()
     # if running in Docker
     if dockerflag:
         if authflag:
@@ -448,7 +449,7 @@ if __name__ == "__main__":
         if authflag:
             demo.queue().launch(share=False, auth=(username, password), favicon_path="./assets/favicon.png", inbrowser=True)
         else:
-            demo.queue().launch(share=False, favicon_path="./assets/favicon.png", inbrowser=True)  # 改为 share=True 可以创建公开分享链接
+            demo.queue().launch(share=False, favicon_path="./assets/favicon.ico", inbrowser=True)  # 改为 share=True 可以创建公开分享链接
         # demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False) # 可自定义端口
         # demo.queue().launch(server_name="0.0.0.0", server_port=7860,auth=("在这里填写用户名", "在这里填写密码")) # 可设置用户名与密码
         # demo.queue().launch(auth=("在这里填写用户名", "在这里填写密码")) # 适合Nginx反向代理

assets/Kelpy-Codos.js

@@ -0,0 +1,76 @@
+// ==UserScript==
+// @name         Kelpy Codos
+// @namespace    https://github.com/Keldos-Li/Kelpy-Codos
+// @version      1.0.5
+// @author       Keldos; https://keldos.me/
+// @description  Add copy button to PRE tags before CODE tag, for Chuanhu ChatGPT especially. 
+//               Based on Chuanhu ChatGPT version: ac04408 (2023-3-22)
+// @license      GPL-3.0
+// @grant        none
+// ==/UserScript==
+
+(function () {
+    'use strict';
+
+    function addCopyButton(pre) {
+        var code = pre.querySelector('code');
+        if (!code) {
+            return; // 如果没有找到 <code> 元素，则不添加按钮
+        }
+        var firstChild = code.firstChild;
+        if (!firstChild) {
+            return; // 如果 <code> 元素没有子节点，则不添加按钮
+        }
+        var button = document.createElement('button');
+        button.textContent = '\uD83D\uDCCE'; // 使用 📎 符号作为“复制”按钮的文本
+        button.style.position = 'relative';
+        button.style.float = 'right';
+        button.style.fontSize = '1em'; // 可选：调整按钮大小
+        button.style.background = 'none'; // 可选：去掉背景颜色
+        button.style.border = 'none'; // 可选：去掉边框
+        button.style.cursor = 'pointer'; // 可选：显示指针样式
+        button.addEventListener('click', function () {
+            var range = document.createRange();
+            range.selectNodeContents(code);
+            range.setStartBefore(firstChild); // 将范围设置为第一个子节点之前
+            var selection = window.getSelection();
+            selection.removeAllRanges();
+            selection.addRange(range);
+
+            try {
+                var success = document.execCommand('copy');
+                if (success) {
+                    button.textContent = '\u2714';
+                    setTimeout(function () {
+                        button.textContent = '\uD83D\uDCCE'; // 恢复按钮为“复制”
+                    }, 2000);
+                } else {
+                    button.textContent = '\u2716';
+                }
+            } catch (e) {
+                console.error(e);
+                button.textContent = '\u2716';
+            }
+
+            selection.removeAllRanges();
+        });
+        code.insertBefore(button, firstChild); // 将按钮插入到第一个子元素之前
+    }
+
+    function handleNewElements(mutationsList, observer) {
+        for (var mutation of mutationsList) {
+            if (mutation.type === 'childList') {
+                for (var node of mutation.addedNodes) {
+                    if (node.nodeName === 'PRE') {
+                        addCopyButton(node);
+                    }
+                }
+            }
+        }
+    }
+
+    var observer = new MutationObserver(handleNewElements);
+    observer.observe(document.documentElement, { childList: true, subtree: true });
+
+    document.querySelectorAll('pre').forEach(addCopyButton);
+})();

assets/custom.js

@@ -0,0 +1 @@
+// custom javascript here

custom.css

@@ -19,45 +19,21 @@
 #chuanhu_chatbot, #status_display {
     transition: all 0.6s;
 }
-
-ol, ul {
-    list-style-position: inside;
-    padding-left: 0;
-}
-
-ol li, ul:not(.options) li {
-    padding-left: 1.5em;
-    text-indent: -1.5em;
+/* list */
+ol:not(.options), ul:not(.options) {
+    padding-inline-start: 2em !important;
 }
 
 /* 亮色 */
-@media (prefers-color-scheme: light) {
-    #chuanhu_chatbot {
-        background-color: var(--chatbot-color-light) !important;
-    }
-    [data-testid = "bot"] {
-        background-color: #FFFFFF !important;
-    }
-    [data-testid = "user"] {
-        background-color: #95EC69 !important;
-    }
-}
-/* 暗色 */
-@media (prefers-color-scheme: dark) {
-    #chuanhu_chatbot {
-        background-color: var(--chatbot-color-dark) !important;
-    }
-    [data-testid = "bot"] {
-        background-color: #2C2C2C !important;
-    }
-    [data-testid = "user"] {
-        background-color: #26B561 !important;
-    }
-    body {
-        background-color: var(--neutral-950) !important;
-    }
+#chuanhu_chatbot {
+    background-color: var(--chatbot-color-light) !important;
+}
+[data-testid = "bot"] {
+    background-color: #FFFFFF !important;
+}
+[data-testid = "user"] {
+    background-color: #95EC69 !important;
 }
-
 /* 对话气泡 */
 [class *= "message"] {
     border-radius: var(--radius-xl) !important;
@@ -65,6 +41,8 @@ ol li, ul:not(.options) li {
     padding: var(--spacing-xl) !important;
     font-size: var(--text-md) !important;
     line-height: var(--line-md) !important;
+    min-height: calc(var(--text-md)*var(--line-md) + 2*var(--spacing-xl));
+    min-width: calc(var(--text-md)*var(--line-md) + 2*var(--spacing-xl));
 }
 [data-testid = "bot"] {
     max-width: 85%;
@@ -107,7 +85,7 @@ pre code {
     white-space: pre;
     background-color: hsla(0, 0%, 0%, 80%)!important;
     border-radius: 10px;
-    padding: 1rem 1.2rem 1rem;
+    padding: 1.4em 1.2em 0em 1.4em;
     margin: 1.2em 2em 1.2em 0.5em;
     color: #FFF;
     box-shadow: 6px 6px 16px hsla(0, 0%, 0%, 0.2);

overwrites.py

@@ -32,7 +32,24 @@ def postprocess(
         return []
     tag_regex = re.compile(r"^<\w+>[^<]+</\w+>")
     if tag_regex.search(y[-1][1]):
-        y[-1] = (y[-1][0].replace("\n", "<br>"), y[-1][1])
+        y[-1] = (convert_user(y[-1][0]), y[-1][1])
     else:
-        y[-1] = (y[-1][0].replace("\n", "<br>"), convert_mdtext(y[-1][1]))
+        y[-1] = (convert_user(y[-1][0]), convert_mdtext(y[-1][1]))
     return y
+
+with open("./assets/custom.js", "r", encoding="utf-8") as f, open("./assets/Kelpy-Codos.js", "r", encoding="utf-8") as f2:
+    customJS = f.read()
+    kelpyCodos = f2.read()
+
+def reload_javascript():
+    print("Reloading javascript...")
+    js = f'<script>{customJS}</script><script>{kelpyCodos}</script>'
+    def template_response(*args, **kwargs):
+        res = GradioTemplateResponseOriginal(*args, **kwargs)
+        res.body = res.body.replace(b'</html>', f'{js}</html>'.encode("utf8"))
+        res.init_headers()
+        return res
+
+    gr.routes.templates.TemplateResponse = template_response
+     
+GradioTemplateResponseOriginal = gr.routes.templates.TemplateResponse

presets.py

@@ -16,7 +16,7 @@ ssl_error_prompt = "SSL错误，无法获取对话。"  # SSL 错误
 no_apikey_msg = "API key长度不是51位，请检查是否输入正确。"  # API key 长度不足 51 位
 
 max_token_streaming = 3500  # 流式对话时的最大 token 数
-timeout_streaming = 30  # 流式对话时的超时时间
+timeout_streaming = 5  # 流式对话时的超时时间
 max_token_all = 3500  # 非流式对话时的最大 token 数
 timeout_all = 200  # 非流式对话时的超时时间
 enable_streaming_option = True  # 是否启用选择选择是否实时显示回答的勾选框

run_Linux.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# 获取脚本所在目录
+script_dir=$(dirname "$0")
+
+# 将工作目录更改为脚本所在目录
+cd "$script_dir"
+
+# 检查Git仓库是否有更新
+git remote update
+pwd
+
+if ! git status -uno | grep 'up to date' > /dev/null; then
+	# 如果有更新，关闭当前运行的服务器
+	pkill -f ChuanhuChatbot.py
+
+	# 拉取最新更改
+	git pull
+
+	# 安装依赖
+	pip3 install -r requirements.txt
+
+	# 重新启动服务器
+	nohup python3 ChuanhuChatbot.py &
+fi

run_Windows.bat

@@ -0,0 +1,5 @@
+@echo off
+echo Opening ChuanhuChatGPT...
+
+REM Open powershell via bat
+start powershell.exe -NoExit -Command "python ./ChuanhuChatbot.py"

run_macOS.command

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# 获取脚本所在目录
+script_dir=$(dirname "$0")
+
+# 将工作目录更改为脚本所在目录
+cd "$script_dir"
+
+# 检查Git仓库是否有更新
+git remote update
+pwd
+
+if ! git status -uno | grep 'up to date' > /dev/null; then
+	# 如果有更新，关闭当前运行的服务器
+	pkill -f ChuanhuChatbot.py
+
+	# 拉取最新更改
+	git pull
+
+	# 安装依赖
+	pip3 install -r requirements.txt
+
+	# 重新启动服务器
+	nohup python3 ChuanhuChatbot.py &
+fi

utils.py

@@ -107,6 +107,9 @@ def convert_mdtext(md_text):
     result = "".join(result)
     return result
 
+def convert_user(userinput):
+    userinput = userinput.replace("\n", "<br>")
+    return f"<pre>{userinput}</pre>"
 
 def detect_language(code):
     if code.startswith("\n"):