update auth

.gitignore

@@ -140,4 +140,5 @@ auth.json
 
 deprecated/
 .vscode
-thunder-tests
+thunder-tests
+*.ipynb

app.py

@@ -72,9 +72,10 @@ PromptHelper.compact_text_chunks = compact_text_chunks
 with open("assets/custom.css", "r", encoding="utf-8") as f:
     customCSS = f.read()
 
-with gr.Blocks(css=customCSS, theme=gr.themes.Soft()) as demo:
+with gr.Blocks(css=customCSS, theme=gr.themes.Soft()) as app:
     history = gr.State([])
     token_count = gr.State([])
+    current_user = gr.State("")
     promptTemplates = gr.State(load_template(get_template_names(plain=True)[0], mode=2))
     user_api_key = gr.State(my_api_key)
     user_question = gr.State("")
@@ -436,21 +437,21 @@ logging.info(
     + colorama.Style.RESET_ALL
 )
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接
-demo.title = "Chatbot 🚀"
+app.title = "Chatbot 🚀"
 
 if __name__ == "__main__":
     reload_javascript()
     # if running in Docker
     if dockerflag:
         if authflag:
-            demo.queue(concurrency_count=CONCURRENT_COUNT).launch(
+            app.queue(concurrency_count=CONCURRENT_COUNT).launch(
                 server_name="0.0.0.0",
                 server_port=7860,
                 auth=auth_list,
                 favicon_path="./assets/rocket.png",
             )
         else:
-            demo.queue(concurrency_count=CONCURRENT_COUNT).launch(
+            app.queue(concurrency_count=CONCURRENT_COUNT).launch(
                 server_name="0.0.0.0",
                 server_port=7860,
                 share=False,
@@ -459,19 +460,19 @@ if __name__ == "__main__":
     # if not running in Docker
     else:
         if authflag:
-            demo.queue(concurrency_count=CONCURRENT_COUNT).launch(
+            app.queue(concurrency_count=CONCURRENT_COUNT).launch(
                 auth=auth_check,
                 favicon_path="./assets/rocket.png",
                 share=False,
                 inbrowser=False,
             )
         else:
-            demo.queue(concurrency_count=CONCURRENT_COUNT).launch(
-                share=False, 
+            app.queue(concurrency_count=CONCURRENT_COUNT).launch(
                 auth=auth_check,
-                favicon_path="./assets/rocket.png"
-                , inbrowser=False
+                favicon_path="./assets/rocket.png",
+                share=False,
+                inbrowser=False,
             )  # 改为 share=True 可以创建公开分享链接
-        # demo.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=7860, share=False) # 可自定义端口
-        # demo.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=7860,auth=("在这里填写用户名", "在这里填写密码")) # 可设置用户名与密码
-        # demo.queue(concurrency_count=CONCURRENT_COUNT).launch(auth=("在这里填写用户名", "在这里填写密码")) # 适合Nginx反向代理
+        # app.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=7860, share=False) # 可自定义端口
+        # app.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=7860,auth=("在这里填写用户名", "在这里填写密码")) # 可设置用户名与密码
+        # app.queue(concurrency_count=CONCURRENT_COUNT).launch(auth=("在这里填写用户名", "在这里填写密码")) # 适合Nginx反向代理

modules/chat_func.py

@@ -375,7 +375,7 @@ def predict(
             status_text = f"Token 达到上限，已自动降低Token计数至 {status_text}"
             yield chatbot, history, status_text, all_token_counts
 
-    d_logged_in_user = logged_user()
+    d_logged_in_user = gr.current_user.value
     d_system_prompt = system_prompt.replace("\n","")
     d_inputs = inputs.replace("\n","")
     d_gpt = history[-1]['content']

modules/utils.py

@@ -83,7 +83,9 @@ def auth_check(username, password):
             break
     if if_pass:
         logging.info(f"Logged in as {username}")
+        gr.current_user = gr.State(username)
         ding_send(f"【成功登录】用户名：{username}")
+        # print(gr.current_user.value)
     else:
         logging.info(f"Login attempt failed:[{username},{password}]")
         ding_send(f"【异常登录】用户名：{username}，密码：{password}")