zhaoqingang 1 year ago
parent
commit
6efaa41969
3 changed files with 14 additions and 18 deletions
  1. 12 15
      app/service/v2/app_driver/chat_workflow.py
  2. 0 1
      app/service/v2/chat.py
  3. 2 2
      main.py

+ 12 - 15
app/service/v2/app_driver/chat_workflow.py

@@ -28,22 +28,19 @@ class ChatWorkflow(ChatBase):
                 print(e)
 
     @staticmethod
-    async def request_data(query: str, conversation_id: str, user:str, chat_data: ChatData) -> dict:
-        inputs = []
-        files = []
-        if hasattr(chat_data,  "inputs"):
+    async def request_data(query: str, conversation_id: str, user: str, chat_data: ChatData) -> dict:
+        data = {"response_mode": "streaming",
+                "conversation_id": conversation_id,
+                "user": user}
+        inputs = {}
+        # files = []
+        if hasattr(chat_data, "inputs"):
             inputs = chat_data.inputs
-        if hasattr(chat_data,  "files"):
+        if hasattr(chat_data, "files"):
             files = chat_data.files
-
-        return {
-            "inputs":inputs,
-            "query": query,
-            "response_mode": "streaming",
-            "conversation_id": conversation_id,
-            "user": user,
-            "files": files
-        }
+            data["files"] = files
+        data["inputs"] = inputs
+        return data
 
 
 if __name__ == "__main__":
@@ -54,7 +51,7 @@ if __name__ == "__main__":
         url = f"{base_url}/v1/chat-messages"
         chat = ChatAgent()
         data = {
-            "inputs":{},
+            "inputs": {},
             "query": "你好,你能做什么?",
             "response_mode": "streaming",
             "conversation_id": "",

+ 0 - 1
app/service/v2/chat.py

@@ -142,7 +142,6 @@ async def service_chat_workflow(db, chat_id: str, chat_data: ChatData, session_i
     files = []
     node_list = []
     token = await get_chat_token(db, chat_id)
-
     chat, url = await get_chat_object(mode)
     if hasattr(chat_data, "query"):
         query = chat_data.query

+ 2 - 2
main.py

@@ -29,7 +29,7 @@ from app.task.delete_execl_file import delete_file_after_delay
 from app.task.fetch_agent import sync_agents, initialize_agents, sync_agents_v2, sync_knowledge, \
     sync_resources_from_json
 from app.init_config.init_run_data import sync_default_data
-from app.task.sync_account_token import sync_token, start_sync_token_task
+from app.task.sync_account_token import start_sync_token_task
 
 init_db()
 
@@ -47,7 +47,7 @@ async def lifespan(app: FastAPI):
     sync_agents_v2()
     sync_knowledge()
     sync_resources_from_json()
-    start_sync_token_task()
+    # start_sync_token_task()
     yield
     # 在应用关闭时执行清理操作(如果需要)
     pass