api error catch

app.py

@@ -1,7 +1,108 @@
-import gradio as gr
-
-def greet(name):
-    return "Hello " + name + "!!"
-
-iface = gr.Interface(fn=greet, inputs="text", outputs="text")
-iface.launch()
+import os; os.environ['no_proxy'] = '*' # 避免代理网络产生意外污染
+import gradio as gr 
+from predict import predict
+from toolbox import format_io, find_free_port
+
+# 建议您复制一个config_private.py放自己的秘密，如API和代理网址，避免不小心传github被别人看到
+try: from config_private import proxies, WEB_PORT 
+except: from config import proxies, WEB_PORT
+
+# 如果WEB_PORT是-1，则随机选取WEB端口
+PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT
+
+initial_prompt = "Serve me as a writing and programming assistant."
+title_html = """<h1 align="center">ChatGPT 学术优化</h1>"""
+
+# 问询记录，python 版本建议3.9+（越新越好）
+import logging
+os.makedirs('gpt_log', exist_ok=True)
+try:logging.basicConfig(filename='gpt_log/chat_secrets.log', level=logging.INFO, encoding='utf-8') 
+except:logging.basicConfig(filename='gpt_log/chat_secrets.log', level=logging.INFO)
+print('所有问询记录将自动保存在本地目录./gpt_log/chat_secrets.log，请注意自我隐私保护哦！')
+
+# 一些普通功能模块
+from functional import get_functionals
+functional = get_functionals()
+
+# 对一些丧心病狂的实验性功能模块进行测试
+from functional_crazy import get_crazy_functionals, on_file_uploaded, on_report_generated
+crazy_functional = get_crazy_functionals()
+
+# 处理markdown文本格式的转变
+gr.Chatbot.postprocess = format_io
+
+# 做一些样式上的调整
+try: set_theme = gr.themes.Default( primary_hue=gr.themes.utils.colors.orange,
+    font=["ui-sans-serif", "system-ui", "sans-serif", gr.themes.utils.fonts.GoogleFont("Source Sans Pro")], 
+    font_mono=["ui-monospace", "Consolas", "monospace", gr.themes.utils.fonts.GoogleFont("IBM Plex Mono")])
+except: 
+    set_theme = None; print('gradio版本较旧，不能自定义字体和颜色')
+
+with gr.Blocks(theme=set_theme, analytics_enabled=False) as demo:
+    gr.HTML(title_html)
+    with gr.Row():
+        with gr.Column(scale=2):
+            chatbot = gr.Chatbot()
+            chatbot.style(height=1000)
+            chatbot.style()
+            history = gr.State([])
+            TRUE = gr.State(True)
+            FALSE = gr.State(False)
+        with gr.Column(scale=1):
+            with gr.Row():
+                with gr.Column(scale=12):
+                    api = gr.Textbox(show_label=False, placeholder="Input OpenAI Key.").style(container=False)
+            with gr.Row():
+                with gr.Column(scale=12):
+                    txt = gr.Textbox(show_label=False, placeholder="Input question here.").style(container=False)
+                with gr.Column(scale=1):
+                    submitBtn = gr.Button("Ask", variant="primary")
+            with gr.Row():
+                for k in functional:
+                    variant = functional[k]["Color"] if "Color" in functional[k] else "secondary"
+                    functional[k]["Button"] = gr.Button(k, variant=variant)
+            with gr.Row():
+                gr.Markdown("以下部分实验性功能需从input框读取路径.")
+            with gr.Row():
+                for k in crazy_functional:
+                    variant = crazy_functional[k]["Color"] if "Color" in crazy_functional[k] else "secondary"
+                    crazy_functional[k]["Button"] = gr.Button(k, variant=variant)
+            with gr.Row():
+                gr.Markdown("上传本地文件供上面的实验性功能调用.")
+            with gr.Row():
+                file_upload = gr.Files(label='任何文件,但推荐上传压缩文件(zip, tar)', file_count="multiple")
+
+            from check_proxy import check_proxy
+            statusDisplay = gr.Markdown(f"{check_proxy(proxies)}")
+            systemPromptTxt = gr.Textbox(show_label=True, placeholder=f"System Prompt", label="System prompt", value=initial_prompt).style(container=True)
+            #inputs, top_p, temperature, top_k, repetition_penalty
+            with gr.Accordion("arguments", open=False):
+                top_p = gr.Slider(minimum=-0, maximum=1.0, value=1.0, step=0.01,interactive=True, label="Top-p (nucleus sampling)",)
+                temperature = gr.Slider(minimum=-0, maximum=5.0, value=1.0, step=0.01, interactive=True, label="Temperature",)
+
+    txt.submit(predict, [api, txt, top_p, temperature, chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay])
+    submitBtn.click(predict, [api, txt, top_p, temperature, chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay], show_progress=True)
+    for k in functional:
+        functional[k]["Button"].click(predict, 
+            [api, txt, top_p, temperature, chatbot, history, systemPromptTxt, TRUE, gr.State(k)], [chatbot, history, statusDisplay], show_progress=True)
+    file_upload.upload(on_file_uploaded, [file_upload, chatbot, txt], [chatbot, txt])
+    for k in crazy_functional:
+        click_handle = crazy_functional[k]["Button"].click(crazy_functional[k]["Function"], 
+            [api, txt, top_p, temperature, chatbot, history, systemPromptTxt, gr.State(PORT)], [chatbot, history, statusDisplay]
+        )
+        try: click_handle.then(on_report_generated, [file_upload, chatbot], [file_upload, chatbot])
+        except: pass
+
+
+# 延迟函数，做一些准备工作，最后尝试打开浏览器
+def auto_opentab_delay():
+    import threading, webbrowser, time
+    print(f"URL http://localhost:{PORT}")
+    def open(): time.sleep(2)
+    webbrowser.open_new_tab(f'http://localhost:{PORT}')
+    t = threading.Thread(target=open)
+    t.daemon = True; t.start()
+
+auto_opentab_delay()
+demo.title = "ChatGPT 学术优化"
+demo.queue().launch(server_name="0.0.0.0", share=True, server_port=PORT)

appx.py

@@ -0,0 +1,7 @@
+import gradio as gr
+
+def greet(name):
+    return "Hello " + name + "!!"
+
+iface = gr.Interface(fn=greet, inputs="text", outputs="text")
+iface.launch()

config.py

@@ -24,3 +24,6 @@ MAX_RETRY = 2
 # 选择的OpenAI模型是（gpt4现在只对申请成功的人开放）
 LLM_MODEL = "gpt-3.5-turbo"
 
+# # 检查一下是不是忘了改config
+# if API_KEY == "sk-此处填API秘钥":
+#     assert False, "请在config文件中修改API密钥, 添加海外代理之后再运行"

main.py

@@ -1,108 +0,0 @@
-import os; os.environ['no_proxy'] = '*' # 避免代理网络产生意外污染
-import gradio as gr 
-from predict import predict
-from toolbox import format_io, find_free_port
-
-# 建议您复制一个config_private.py放自己的秘密，如API和代理网址，避免不小心传github被别人看到
-try: from config_private import proxies, WEB_PORT 
-except: from config import proxies, WEB_PORT
-
-# 如果WEB_PORT是-1，则随机选取WEB端口
-PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT
-
-initial_prompt = "Serve me as a writing and programming assistant."
-title_html = """<h1 align="center">ChatGPT 学术优化</h1>"""
-
-# 问询记录，python 版本建议3.9+（越新越好）
-import logging
-os.makedirs('gpt_log', exist_ok=True)
-try:logging.basicConfig(filename='gpt_log/chat_secrets.log', level=logging.INFO, encoding='utf-8') 
-except:logging.basicConfig(filename='gpt_log/chat_secrets.log', level=logging.INFO)
-print('所有问询记录将自动保存在本地目录./gpt_log/chat_secrets.log，请注意自我隐私保护哦！')
-
-# 一些普通功能模块
-from functional import get_functionals
-functional = get_functionals()
-
-# 对一些丧心病狂的实验性功能模块进行测试
-from functional_crazy import get_crazy_functionals, on_file_uploaded, on_report_generated
-crazy_functional = get_crazy_functionals()
-
-# 处理markdown文本格式的转变
-gr.Chatbot.postprocess = format_io
-
-# 做一些样式上的调整
-try: set_theme = gr.themes.Default( primary_hue=gr.themes.utils.colors.orange,
-    font=["ui-sans-serif", "system-ui", "sans-serif", gr.themes.utils.fonts.GoogleFont("Source Sans Pro")], 
-    font_mono=["ui-monospace", "Consolas", "monospace", gr.themes.utils.fonts.GoogleFont("IBM Plex Mono")])
-except: 
-    set_theme = None; print('gradio版本较旧，不能自定义字体和颜色')
-
-with gr.Blocks(theme=set_theme, analytics_enabled=False) as demo:
-    gr.HTML(title_html)
-    with gr.Row():
-        with gr.Column(scale=2):
-            chatbot = gr.Chatbot()
-            chatbot.style(height=1000)
-            chatbot.style()
-            history = gr.State([])
-            TRUE = gr.State(True)
-            FALSE = gr.State(False)
-        with gr.Column(scale=1):
-            with gr.Row():
-                with gr.Column(scale=12):
-                    api = gr.Textbox(show_label=False, placeholder="Input OpenAI Key.").style(container=False)
-            with gr.Row():
-                with gr.Column(scale=12):
-                    txt = gr.Textbox(show_label=False, placeholder="Input question here.").style(container=False)
-                with gr.Column(scale=1):
-                    submitBtn = gr.Button("Ask", variant="primary")
-            with gr.Row():
-                for k in functional:
-                    variant = functional[k]["Color"] if "Color" in functional[k] else "secondary"
-                    functional[k]["Button"] = gr.Button(k, variant=variant)
-            with gr.Row():
-                gr.Markdown("以下部分实验性功能需从input框读取路径.")
-            with gr.Row():
-                for k in crazy_functional:
-                    variant = crazy_functional[k]["Color"] if "Color" in crazy_functional[k] else "secondary"
-                    crazy_functional[k]["Button"] = gr.Button(k, variant=variant)
-            with gr.Row():
-                gr.Markdown("上传本地文件供上面的实验性功能调用.")
-            with gr.Row():
-                file_upload = gr.Files(label='任何文件,但推荐上传压缩文件(zip, tar)', file_count="multiple")
-
-            from check_proxy import check_proxy
-            statusDisplay = gr.Markdown(f"{check_proxy(proxies)}")
-            systemPromptTxt = gr.Textbox(show_label=True, placeholder=f"System Prompt", label="System prompt", value=initial_prompt).style(container=True)
-            #inputs, top_p, temperature, top_k, repetition_penalty
-            with gr.Accordion("arguments", open=False):
-                top_p = gr.Slider(minimum=-0, maximum=1.0, value=1.0, step=0.01,interactive=True, label="Top-p (nucleus sampling)",)
-                temperature = gr.Slider(minimum=-0, maximum=5.0, value=1.0, step=0.01, interactive=True, label="Temperature",)
-
-    txt.submit(predict, [api, txt, top_p, temperature, chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay])
-    submitBtn.click(predict, [api, txt, top_p, temperature, chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay], show_progress=True)
-    for k in functional:
-        functional[k]["Button"].click(predict, 
-            [api, txt, top_p, temperature, chatbot, history, systemPromptTxt, TRUE, gr.State(k)], [chatbot, history, statusDisplay], show_progress=True)
-    file_upload.upload(on_file_uploaded, [file_upload, chatbot, txt], [chatbot, txt])
-    for k in crazy_functional:
-        click_handle = crazy_functional[k]["Button"].click(crazy_functional[k]["Function"], 
-            [api, txt, top_p, temperature, chatbot, history, systemPromptTxt, gr.State(PORT)], [chatbot, history, statusDisplay]
-        )
-        try: click_handle.then(on_report_generated, [file_upload, chatbot], [file_upload, chatbot])
-        except: pass
-
-
-# 延迟函数，做一些准备工作，最后尝试打开浏览器
-def auto_opentab_delay():
-    import threading, webbrowser, time
-    print(f"URL http://localhost:{PORT}")
-    def open(): time.sleep(2)
-    webbrowser.open_new_tab(f'http://localhost:{PORT}')
-    t = threading.Thread(target=open)
-    t.daemon = True; t.start()
-
-auto_opentab_delay()
-demo.title = "ChatGPT 学术优化"
-demo.queue().launch(server_name="0.0.0.0", share=True, server_port=PORT)

predict.py

@@ -130,8 +130,10 @@ def predict(api, inputs, top_p, temperature, chatbot=[], history=[], system_prom
                     chunk = get_full_error(chunk, stream_response)
                     error_msg = chunk.decode()
                     if "reduce the length" in error_msg:
-                        chatbot[-1] = (history[-1], "[Local Message] Input (or history) is too long, please reduce input or clear history by refleshing this page.")
+                        chatbot[-1] = (chatbot[-1][0], "[Local Message] Input (or history) is too long, please reduce input or clear history by refleshing this page.")
                         history = []
+                    if "Incorrect API key" in error_msg:
+                        chatbot[-1] = (chatbot[-1][0], "[Local Message] Incorrect API key provided.")
                     yield chatbot, history, "Json解析不合常规，很可能是文本过长" + error_msg
                     return
 
@@ -141,7 +143,7 @@ def generate_payload(api, inputs, top_p, temperature, history, system_prompt, st
     """
     headers = {
         "Content-Type": "application/json",
-        "Authorization": f"Bearer {API_KEY}"
+        "Authorization": f"Bearer {api}"
     }
 
     conversation_cnt = len(history) // 2