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','access_token'], function(result) {
+        chrome.storage.sync.get(['data'], function(result) {
           chrome.storage.sync.set({ data: result.data }, function() {
-            send_data({ 'content' : msg.data, 'query': '', 'url': result.access_token + "_" + url, 'task':'cache', 'type':msg.type});
+            send_data({ 'content' : msg.data, 'query': '', 'url': url, 'task':'cache', 'type':msg.type});
           });
         });
       }
@@ -41,7 +41,7 @@ chrome.runtime.onMessage.addListener(async (msg, sender) => {
     if (msg.data) {
       chrome.storage.sync.get(['data','access_token'], function(result) {
         chrome.storage.sync.set({ data: result.data }, function() {
-            send_data({ 'url' : result.access_token + "_" + msg.data, 'task':'pop_url'});
+            send_data({ 'url' : msg.data, 'task':'pop_url'});
         });
       });
     }

qwen_server/assistant_server.py

@@ -58,7 +58,7 @@ 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):
-        _access_token = cache_file_popup_url.split("_")[0]
+        _access_token = line['access_token']
         if _access_token not in lines:
             lines[_access_token] = []
         lines[_access_token].append(line)
@@ -85,7 +85,7 @@ def bot(history, access_token):
             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[access_token][-1]:
+                if line["access_token"] == access_token and line['url'] == PAGE_URL[access_token][-1]:
                     now_page = line
 
             if not now_page:
@@ -119,7 +119,7 @@ def bot(history, access_token):
             now_page['session'] = history
             lines = []
             for line in jsonlines.open(cache_file):
-                if line['url'] != PAGE_URL[access_token][-1]:
+                if line["access_token"] == access_token and line['url'] != PAGE_URL[access_token][-1]:
                     lines.append(line)
 
             lines.append(now_page)
@@ -134,7 +134,7 @@ def load_history_session(history, access_token):
         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[access_token][-1]:
+        if line["access_token"] == access_token and 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!")
@@ -151,7 +151,7 @@ def clear_session(access_token):
     now_page = None
     lines = []
     for line in jsonlines.open(cache_file):
-        if line['url'] == PAGE_URL[access_token][-1]:
+        if line["access_token"] == access_token and line['url'] == PAGE_URL[access_token][-1]:
             now_page = line
         else:
             lines.append(line)

qwen_server/database_server.py

@@ -46,9 +46,8 @@ app.mount('/static',
           name='static')
 
 
-def update_pop_url(data, cache_file_popup_url):
-    _access_token = data['url'].split("_")[0]
-    new_line = {'url': data['url']}
+def update_pop_url(data, cache_file_popup_url, access_token):
+    new_line = {'url': data['url'], "access_token": access_token}
     lines = []
     for line in jsonlines.open(cache_file_popup_url):
         lines.append(line)
@@ -60,12 +59,12 @@ def update_pop_url(data, cache_file_popup_url):
     return response
 
 
-def change_checkbox_state(text, cache_file):
+def change_checkbox_state(text, cache_file,access_token):
     if not os.path.exists(cache_file):
         return {'result': 'no file'}
     lines = []
     for line in jsonlines.open(cache_file):
-        if line['url'] == text[3:]:
+        if line['url'] == text[3:] and line['access_token'] == access_token:
             if line['checked']:
                 line['checked'] = False
             else:
@@ -107,16 +106,16 @@ async def cache_data(file_name: str):
 async def web_listening(request: Request):
     data = await request.json()
     msg_type = data['task']
-
+    access_token = request.session.get("access_token")
     cache_file_popup_url = os.path.join(server_config.path.cache_root, 'popup_url.jsonl')
     cache_file = os.path.join(server_config.path.cache_root, 'browse.jsonl')
 
     if msg_type == 'change_checkbox':
-        rsp = change_checkbox_state(data['ckid'], cache_file)
+        rsp = change_checkbox_state(data['ckid'], cache_file, access_token)
     elif msg_type == 'cache':
         cache_obj = multiprocessing.Process(
             target=extract_and_cache_document,
-            args=(data, cache_file, server_config.path.cache_root))
+            args=(data, cache_file, server_config.path.cache_root,access_token))
         cache_obj.start()
         # rsp = cache_data(data, cache_file)
         rsp = 'caching'

qwen_server/utils.py

@@ -44,7 +44,7 @@ def sanitize_chrome_file_path(file_path: str) -> str:
     return file_path
 
 
-def extract_and_cache_document(data, cache_file, cache_root):
+def extract_and_cache_document(data, cache_file, cache_root, access_token):
     logger.info('Starting cache pages...')
     if data['url'].split('.')[-1].lower() in ['pdf', 'docx', 'pptx']:
         date1 = datetime.datetime.now()
@@ -55,6 +55,7 @@ def extract_and_cache_document(data, cache_file, cache_root):
                             type=data['type'],
                             raw=[],
                             extract='',
+                            access_token=access_token,
                             topic='',
                             checked=False,
                             session=[]).to_dict()
@@ -95,6 +96,7 @@ def extract_and_cache_document(data, cache_file, cache_root):
                             type=data['type'],
                             raw=[],
                             extract='',
+                            access_token=access_token,
                             topic='',
                             checked=False,
                             session=[]).to_dict()
@@ -120,6 +122,7 @@ def extract_and_cache_document(data, cache_file, cache_root):
                         type=data['type'],
                         raw=data['content'],
                         extract=extract,
+                        access_token=access_token,
                         topic='',
                         checked=True,
                         session=[])