prompt 完整消息存储

Author: yaojin

src/backend/bisheng/api/services/workstation.py

@@ -124,10 +124,12 @@ def get_chat_history(cls, chat_id: str, size: int = 4):
         for one in messages:
             # bug fix When constructing multi-turn dialogues, the input and response of
             # the user and the assistant were reversed, leading to incorrect question-and-answer sequences.
+            extra = json.loads(one.extra) or {}
+            content = extra['prompt'] if 'prompt' in extra else one.message
             if one.category == MsgCategory.Question:
-                chat_history.append(HumanMessage(content=one.message))
+                chat_history.append(HumanMessage(content=content))
             elif one.category == MsgCategory.Answer:
-                chat_history.append(AIMessage(content=one.message))
+                chat_history.append(AIMessage(content=content))
         logger.info(f'loaded {len(chat_history)} chat history for chat_id {chat_id}')
         return chat_history
 

src/backend/bisheng/api/v1/workstation.py

@@ -168,7 +168,7 @@ async def upload_file(
     """
     # 读取文件内容
     # 保存文件
-    file_path = save_uploaded_file(file.file, 'bisheng', file.filename)
+    file_path = save_uploaded_file(file.file, 'bisheng', unquote(file.filename))
 
     # 返回文件路径
     return resp_200(
@@ -207,7 +207,7 @@ async def gen_title(conversationId: str = Body(..., description='', embed=True),
     else:
         # 如果标题不存在，则返回空值
         return resp_500(
-            "Title not found or method not implemented for the conversation\'s endpoint")
+            data="Title not found or method not implemented for the conversation\'s endpoint")
 
 
 @router.get('/messages/{conversationId}')
@@ -370,13 +370,18 @@ async def event_stream():
                 chunks = WorkStationService.queryChunksFromDB(data.text, login_user)
                 prompt = wsConfig.knowledgeBase.prompt.format(
                     retrieved_file_content='\n'.join(chunks)[:max_token], question=data.text)
-
-            if data.files:
+            elif data.files:
                 #  获取文件全文
                 filecontent = '\n'.join(
                     [getFileContent(file.get('filepath')) for file in data.files])
                 prompt = wsConfig.fileUpload.prompt.format(file_content=filecontent[:max_token],
                                                            question=data.text)
+            if prompt != data.text:
+                # 需要将原始消息存储
+                extra = json.loads(message.extra)
+                extra['prompt'] = prompt
+                message.extra = json.dumps(extra)
+                ChatMessageDao.insert_one(message)
         except Exception as e:
             logger.error(f'Error in processing the prompt: {e}')
             error = True