use token

browser_qwen/background.js

@@ -29,9 +29,9 @@ chrome.runtime.onMessage.addListener(async (msg, sender) => {
       url = tabs[0].url;
       console.log(url);
       if (msg.data) {
-        chrome.storage.sync.get(['data'], function(result) {
+        chrome.storage.sync.get(['data','access_token'], function(result) {
           chrome.storage.sync.set({ data: result.data }, function() {
-            send_data({ 'content' : msg.data, 'query': '', 'url':url, 'task':'cache', 'type':msg.type});
+            send_data({ 'content' : msg.data, 'query': '', 'url': result.access_token + "_" + url, 'task':'cache', 'type':msg.type});
           });
         });
       }
@@ -39,9 +39,9 @@ chrome.runtime.onMessage.addListener(async (msg, sender) => {
   }
   if (msg.flag == "open_popup_and_send_url_from_popup"){
     if (msg.data) {
-      chrome.storage.sync.get(['data'], function(result) {
+      chrome.storage.sync.get(['data','access_token'], function(result) {
         chrome.storage.sync.set({ data: result.data }, function() {
-            send_data({ 'url' : msg.data, 'task':'pop_url'});
+            send_data({ 'url' : result.access_token + "_" + msg.data, 'task':'pop_url'});
         });
       });
     }

browser_qwen/background_副本.js

@@ -1,58 +0,0 @@
-var database;
-
-function send_data(msg){
-    chrome.storage.local.get(['database_host'], function(result) {
-        if (result.database_host) {
-            console.log('database_host currently is ' + result.database_host);
-            database = "http://"+result.database_host+":7866/endpoint";
-        } else {
-            database = "http://127.0.0.1:7866/endpoint";
-        }
-        fetch(database, {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify(msg),
-        })
-          .then((response) => response.json())
-          .then((data) => {
-            console.log(data.result);
-          });
-     });
-}
-
-chrome.runtime.onMessage.addListener(async (msg, sender) => {
-  if (msg.flag == "open_tab_and_cache_from_content"){
-    var url = "";
-    chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
-      url = tabs[0].url;
-      console.log(url);
-      if (msg.data) {
-        chrome.storage.sync.get(['data'], function(result) {
-          chrome.storage.sync.set({ data: result.data }, function() {
-            send_data({ 'content' : msg.data, 'query': '', 'url':url, 'task':'cache', 'type':msg.type});
-          });
-        });
-      }
-    });
-  }
-  if (msg.flag == "open_popup_and_send_url_from_popup"){
-    if (msg.data) {
-      chrome.storage.sync.get(['data'], function(result) {
-        chrome.storage.sync.set({ data: result.data }, function() {
-            send_data({ 'url' : msg.data, 'task':'pop_url'});
-        });
-      });
-    }
-  }
-//  if (msg.flag == "set_addr"){
-//    if (msg.data) {
-//      chrome.storage.sync.get(['data'], function(result) {
-//        chrome.storage.sync.set({ data: result.data }, function() {
-//            send_data({ 'addr' : msg.data, 'task':'set_addr'});
-//        });
-//      });
-//    }
-//  }
-});

browser_qwen/manifest.json

@@ -10,7 +10,7 @@
 
     "action": {
         "default_popup": "src/popup.html",
-        "default_icon": "img/popup.jpg",
+        "default_icon": "img/popup.png",
         "default_title": "BrowserLLMBB"
     },
     "permissions": [

browser_qwen/src/popup_副本.js

@@ -1,65 +0,0 @@
-
-
-chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
-    // if (msg.flag == 'from_content'){
-    //   console.log(msg.rsp);
-    //   var sessionContainer = document.getElementById('session');
-    //   sessionContainer.innerText = msg.rsp;
-    //   sendResponse({ msg: 'Get!' });
-    // }
-    if (msg.flag === 'from_llm'){
-      // var sessionContainer = document.getElementById('session');
-      // // sessionContainer.innerHTML = msg.rsp;
-      // sessionContainer.innerText = msg.rsp;
-      sendResponse({ message: 'Get Response!' });
-    }
-});
-
-
-document.addEventListener('DOMContentLoaded', function() {
-    chrome.tabs.query({ active: true, currentWindow: true }, function(tabs) {
-      var currentUrl = tabs[0].url;
-
-      chrome.runtime.sendMessage({ data: currentUrl , close: true , flag: 'open_popup_and_send_url_from_popup'});
-
-    });
-    setTimeout(function() {
-//        console.log('This message will be logged after 0.5 second');
-        var popup_url='';
-        chrome.storage.local.get(['database_host'], function(result) {
-            if (result.database_host) {
-                console.log('database_host currently is ' + result.database_host);
-                popup_url = "http://"+result.database_host+":7863/";
-            } else {
-                popup_url = "http://127.0.0.1:7863/";
-            }
-            var iframe = document.createElement('iframe');
-            iframe.src = popup_url;
-            iframe.height = '570px';
-//            iframe.sandbox = 'allow-same-origin allow-scripts';
-//            iframe.allow = "geolocation *;";
-            var iframe_area = document.getElementById('iframe_area')
-            iframe_area.appendChild(iframe);
-
-        });
-    }, 500);
-
-//    fetch('../config_host.json')
-//      .then(response => response.json())
-//      .then(data => {
-//        console.log(data);
-//        popup_url = "http://"+data.database_host+":"+data.app_in_browser_port+"/";
-//        console.log(popup_url);
-//    })
-//    .catch(error => console.error('Error:', error));
-})
-
-document.getElementById('set_addr').addEventListener('click', function() {
-    var addr = document.getElementById('addr').value;
-    // save config
-    chrome.storage.local.set({database_host: addr}, function() {
-      console.log('database_host is set to ' + addr);
-//      chrome.runtime.sendMessage({ data: addr , close: true , flag: 'set_addr'});
-      document.getElementById('addr').value = '';
-    });
-})

qwen_server/assistant_server.py

@@ -26,7 +26,7 @@ mem = Memory(llm=llm, stream=False)
 cache_file = os.path.join(server_config.path.cache_root, 'browse.jsonl')
 cache_file_popup_url = os.path.join(server_config.path.cache_root, 'popup_url.jsonl')
 
-PAGE_URL = []
+PAGE_URL = {}
 
 with open(Path(__file__).resolve().parent / 'css/main.css', 'r') as f:
     css = f.read()
@@ -50,33 +50,32 @@ def rm_text(history):
 
 
 def add_file(history, file):
-    history = history + [((file.name, ), None)]
+    history = history + [((file.name,), None)]
     return history
 
 
-def set_page_url():
-    lines = []
+def set_page_url(access_token):
+    lines = {access_token: []}
     assert os.path.exists(cache_file_popup_url)
     for line in jsonlines.open(cache_file_popup_url):
-        lines.append(line)
-    PAGE_URL.append(lines[-1]['url'])
-    logger.info('The current access page is: ' + PAGE_URL[-1])
+        _access_token = cache_file_popup_url.split("_")[0]
+        if _access_token not in lines:
+            lines[_access_token] = []
+        lines[_access_token].append(line)
+    if access_token not in PAGE_URL:
+        PAGE_URL[access_token] = []
+    PAGE_URL[access_token].append(lines[access_token][-1]['url'])
+    logger.info('The current access page is: ' + PAGE_URL[access_token][-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))
+    access_token = request.session["access_token"] or request.query_params["access_token"]
+    set_page_url(access_token)
     return access_token
 
 
-def bot(history):
-    set_page_url()
+def bot(history, access_token):
+    set_page_url(access_token)
     if not history:
         yield history
     else:
@@ -86,7 +85,7 @@ def bot(history):
             gr.Info("Please add this page to LLMBB's Reading List first!")
         else:
             for line in jsonlines.open(cache_file):
-                if line['url'] == PAGE_URL[-1]:
+                if line['url'] == PAGE_URL[access_token][-1]:
                     now_page = line
 
             if not now_page:
@@ -120,7 +119,7 @@ def bot(history):
             now_page['session'] = history
             lines = []
             for line in jsonlines.open(cache_file):
-                if line['url'] != PAGE_URL[-1]:
+                if line['url'] != PAGE_URL[access_token][-1]:
                     lines.append(line)
 
             lines.append(now_page)
@@ -129,13 +128,13 @@ def bot(history):
                     writer.write(new_line)
 
 
-def load_history_session(history):
+def load_history_session(history, access_token):
     now_page = None
     if not os.path.exists(cache_file):
         gr.Info("Please add this page to LLMBB's Reading List first!")
         return []
     for line in jsonlines.open(cache_file):
-        if line['url'] == PAGE_URL[-1]:
+        if line['url'] == PAGE_URL[access_token][-1]:
             now_page = line
     if not now_page:
         gr.Info("Please add this page to LLMBB's Reading List first!")
@@ -146,13 +145,13 @@ def load_history_session(history):
     return now_page['session']
 
 
-def clear_session():
+def clear_session(access_token):
     if not os.path.exists(cache_file):
         return None
     now_page = None
     lines = []
     for line in jsonlines.open(cache_file):
-        if line['url'] == PAGE_URL[-1]:
+        if line['url'] == PAGE_URL[access_token][-1]:
             now_page = line
         else:
             lines.append(line)
@@ -190,7 +189,7 @@ with gr.Blocks(css=css, theme='soft') as demo:
             re_bt = gr.Button('🔁', elem_classes='bt_small_font')
 
     txt_msg = txt.submit(add_text, [chatbot, txt], [chatbot, txt],
-                         queue=False).then(bot, chatbot, chatbot)
+                         queue=False).then(bot, [chatbot, access_token], chatbot)
     txt_msg.then(lambda: gr.update(interactive=True), None, [txt], queue=False)
 
     # txt_msg_bt = smt_bt.click(add_text, [chatbot, txt], [chatbot, txt],
@@ -199,16 +198,16 @@ with gr.Blocks(css=css, theme='soft') as demo:
     #                 None, [txt],
     #                 queue=False)
 
-    clr_bt.click(clear_session, None, chatbot, queue=False)
+    clr_bt.click(clear_session, [access_token], chatbot, queue=False)
     re_txt_msg = re_bt.click(rm_text, [chatbot], [chatbot, txt],
-                             queue=False).then(bot, chatbot, chatbot)
+                             queue=False).then(bot, [chatbot, access_token], chatbot)
     re_txt_msg.then(lambda: gr.update(interactive=True),
                     None, [txt],
                     queue=False)
 
     stop_bt.click(None, None, None, cancels=[txt_msg, re_txt_msg], queue=False)
 
-    demo.load(initialize, [], [access_token]).then(load_history_session, chatbot, chatbot)
+    demo.load(initialize, [], [access_token]).then(load_history_session, [chatbot, access_token], 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

@@ -47,11 +47,15 @@ app.mount('/static',
 
 
 def update_pop_url(data, cache_file_popup_url):
+    _access_token = data['url'].split("_")[0]
     new_line = {'url': data['url']}
-
+    lines = []
+    for line in jsonlines.open(cache_file_popup_url):
+        lines.append(line)
+    lines.append(new_line)
     with jsonlines.open(cache_file_popup_url, mode='w') as writer:
-        writer.write(new_line)
-
+        for new_line in lines:
+            writer.write(new_line)
     response = 'Update URL'
     return response
 
@@ -91,7 +95,7 @@ async def healthz(request: Request):
 
 
 @app.get('/cachedata/{file_name}')
-async def cache_data(file_name: str, access_token: str):
+async def cache_data(file_name: str):
     cache_file = os.path.join(server_config.path.cache_root, file_name)
     lines = []
     for line in jsonlines.open(cache_file):
@@ -131,7 +135,7 @@ from qwen_server.assistant_server import demo as assistant_app
 
 # app = gr.mount_gradio_app(app, workstation_app, path="/workstation")
 app = gr.mount_gradio_app(app, assistant_app, path="/")
-app.add_middleware(SessionMiddleware, secret_key='dddsadf453454f64554dsgdfghfg', max_age=25200)
+app.add_middleware(SessionMiddleware, secret_key=os.getenv("SECRET_KEY"), max_age=25200)
 if __name__ == '__main__':
     uvicorn.run(app='database_server:app',
                 host=server_config.server.server_host,