update oai

browser_qwen/background.js

@@ -4,9 +4,9 @@ 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";
+            database = "https://taohongxiu-qwen-agent.hf.space/endpoint";
         } else {
-            database = "http://127.0.0.1:7866/endpoint";
+            database = "https://taohongxiu-qwen-agent.hf.space/endpoint";
         }
         fetch(database, {
             method: "POST",

browser_qwen/src/popup.js

@@ -29,7 +29,7 @@ document.addEventListener('DOMContentLoaded', function() {
         chrome.storage.local.get(['database_host'], function(result) {
             if (result.database_host) {
                 console.log('database_host currently is ' + result.database_host);
-                popup_url = "https://"+result.database_host;
+                popup_url = "https://taohongxiu-qwen-agent.hf.space/";
             } else {
                 popup_url = "https://taohongxiu-qwen-agent.hf.space/";
             }

qwen_server/assistant_server.py

@@ -196,6 +196,6 @@ 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(set_page_url).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)
+# demo.queue().launch(server_name=server_config.server.server_host, server_port=server_config.server.app_in_browser_port)

qwen_server/database_server.py

@@ -34,7 +34,7 @@ origins = [
 
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=origins,
+    # allow_origins=origins,
     allow_credentials=True,
     allow_methods=['*'],
     allow_headers=['*'],
@@ -101,6 +101,14 @@ async def web_listening(request: Request):
     return JSONResponse(content=rsp)
 
 
+import gradio as gr
+from qwen_server.workstation_server import demo as workstation_app
+from qwen_server.assistant_server import demo as assistant_app
+
+
+app = gr.mount_gradio_app(app, assistant_app, path="/")
+app = gr.mount_gradio_app(app, workstation_app, path="/workstation")
+
 if __name__ == '__main__':
     uvicorn.run(app='database_server:app',
                 host=server_config.server.server_host,

qwen_server/js/main.js

@@ -29,7 +29,7 @@ var checkboxes = document.querySelectorAll('input[type="checkbox"]');
 checkboxes.forEach(function(checkbox) {
   checkbox.addEventListener("change", function() {
     console.log(location.hostname)
-    var _server_url = "http://"+location.hostname+":7866/endpoint";
+    var _server_url = "https://taohongxiu-qwen-agent.hf.space/endpoint";
     fetch(_server_url, {
       method: "POST",
       headers: {

qwen_server/server_config.json

@@ -1 +1 @@
-{"path": {"work_space_root": "workspace/", "cache_root": "workspace/browser_cache/", "download_root": "workspace/download/", "code_interpreter_ws": "workspace/ci_workspace/"}, "server": {"server_host": "127.0.0.1", "fast_api_port": 7866, "app_in_browser_port": 7860, "workstation_port": 7864, "model_server": "dashscope", "api_key": "", "llm": "qwen-plus", "max_ref_token": 4000, "max_days": 7}}
+{"path": {"work_space_root": "workspace/", "cache_root": "workspace/browser_cache/", "download_root": "workspace/download/", "code_interpreter_ws": "workspace/ci_workspace/"}, "server": {"server_host": "127.0.0.1", "fast_api_port": 7860, "app_in_browser_port": 7863, "workstation_port": 7864, "model_server": "dashscope", "api_key": "", "llm": "qwen-plus", "max_ref_token": 4000, "max_days": 7}}

qwen_server/workstation_server.py

@@ -739,6 +739,6 @@ with gr.Blocks(css=css, theme='soft') as demo:
                                      _js=f'() => {{{js}}}').then(
                                          chat_clear, None,
                                          [chatbot, hidden_file_path])
+    demo.queue()
 
-demo.queue().launch(server_name=server_config.server.server_host,
-                    server_port=server_config.server.workstation_port)
+# demo.queue().launch(server_name=server_config.server.server_host, server_port=server_config.server.workstation_port)