add token

qwen_server/assistant_server.py

@@ -34,35 +34,12 @@ with open(Path(__file__).resolve().parent / 'js/main.js', 'r') as f:
     js = f.read()
 
 
-def check_access_token(access_token):
-    if not access_token:
-        gr.Info('The access token is not valid, please reset!')
-        return False
-    return True
-
-
-def initialize(request: gr.Request):
-    set_page_url()
-    # print("Request headers dictionary:", request.headers)
-    params = dict(request.query_params)
-    access_token = params.get("access_token")
-    if not access_token or os.getenv("ACCESS_TOKEN") != access_token:
-        gr.Info('The access token is not valid, please reset!')
-        return ''
-    # print("Query parameters:", dict(request.query_params))
-    return access_token
-
-
-def add_text(history, text, access_token):
-    if not check_access_token(access_token):
-        return
+def add_text(history, text):
     history = history + [(text, None)]
     return history, gr.update(value='', interactive=False)
 
 
-def rm_text(history, access_token):
-    if not check_access_token(access_token):
-        return
+def rm_text(history):
     if not history:
         gr.Warning('No input content!')
     elif not history[-1][1]:
@@ -73,7 +50,7 @@ def rm_text(history, access_token):
 
 
 def add_file(history, file):
-    history = history + [((file.name,), None)]
+    history = history + [((file.name, ), None)]
     return history
 
 
@@ -85,6 +62,19 @@ def set_page_url():
     PAGE_URL.append(lines[-1]['url'])
     logger.info('The current access page is: ' + PAGE_URL[-1])
 
+
+def initialize(request: gr.Request):
+    set_page_url()
+    # print("Request headers dictionary:", request.headers)
+    params = dict(request.query_params)
+    access_token = params.get("access_token")
+    # if not access_token or os.getenv("ACCESS_TOKEN") != access_token:
+    #     gr.Info('The access token is not valid, please reset!')
+    #     return ''
+    # print("Query parameters:", dict(request.query_params))
+    return access_token
+
+
 def bot(history):
     set_page_url()
     if not history:
@@ -139,9 +129,7 @@ def bot(history):
                     writer.write(new_line)
 
 
-def load_history_session(history, access_token):
-    if not check_access_token(access_token):
-        return
+def load_history_session(history):
     now_page = None
     if not os.path.exists(cache_file):
         gr.Info("Please add this page to ChatGPT's Reading List first!")
@@ -158,9 +146,7 @@ def load_history_session(history, access_token):
     return now_page['session']
 
 
-def clear_session(access_token):
-    if not check_access_token(access_token):
-        return
+def clear_session():
     if not os.path.exists(cache_file):
         return None
     now_page = None
@@ -203,7 +189,7 @@ with gr.Blocks(css=css, theme='soft') as demo:
         with gr.Column(scale=1, min_width=0):
             re_bt = gr.Button('🔁', elem_classes='bt_small_font')
 
-    txt_msg = txt.submit(add_text, [chatbot, txt, access_token], [chatbot, txt],
+    txt_msg = txt.submit(add_text, [chatbot, txt], [chatbot, txt],
                          queue=False).then(bot, chatbot, chatbot)
     txt_msg.then(lambda: gr.update(interactive=True), None, [txt], queue=False)
 
@@ -213,8 +199,8 @@ with gr.Blocks(css=css, theme='soft') as demo:
     #                 None, [txt],
     #                 queue=False)
 
-    clr_bt.click(clear_session, [access_token], chatbot, queue=False)
-    re_txt_msg = re_bt.click(rm_text, [chatbot, access_token], [chatbot, txt],
+    clr_bt.click(clear_session, None, chatbot, queue=False)
+    re_txt_msg = re_bt.click(rm_text, [chatbot], [chatbot, txt],
                              queue=False).then(bot, chatbot, chatbot)
     re_txt_msg.then(lambda: gr.update(interactive=True),
                     None, [txt],
@@ -222,7 +208,7 @@ with gr.Blocks(css=css, theme='soft') as demo:
 
     stop_bt.click(None, None, None, cancels=[txt_msg, re_txt_msg], queue=False)
 
-    demo.load(initialize, [], [access_token]).then(load_history_session, [chatbot, access_token], chatbot)
+    demo.load(initialize, [], [access_token]).then(load_history_session, chatbot, chatbot)
     demo.queue()
 
 # demo.queue().launch(server_name=server_config.server.server_host, server_port=server_config.server.app_in_browser_port)

qwen_server/database_server.py

@@ -16,7 +16,8 @@ from qwen_agent.utils.utils import get_local_ip
 from qwen_server.schema import GlobalConfig
 from qwen_server.utils import extract_and_cache_document
 from starlette.middleware.base import BaseHTTPMiddleware
-from fastapi.security import HTTPBearer
+from typing import Callable, Coroutine, Any
+
 
 # Read config
 with open(Path(__file__).resolve().parent / 'server_config.json', 'r') as f:
@@ -77,11 +78,11 @@ def change_checkbox_state(text, cache_file):
 
 
 @app.middleware("http")
-async def validate_token(request: Request, call_next):
+async def add_process_time_header(request: Request, call_next):
+    print(f"Request URL path: {request.url}")
     access_token: str = request.headers.get("Authorization") or request.query_params.get("access_token")
     if not access_token or os.getenv("ACCESS_TOKEN") != access_token:
-        headers = {'WWW-Authenticate': 'Basic'}
-        return Response(status_code=401, headers=headers)
+        return Response(status_code=401, content="the token is not valid")
     return await call_next(request)