adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(workflow): move conversation file content into metadata

Browse Source
This commit is contained in:
Eternity
2026-03-19 11:03:15 +08:00
parent 3df8af3852
commit 68f9471caf
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/app/controllers/memory_working_controller.py
View File

@@ -8,6 +8,7 @@ from app.core.response_utils import success
from app.db import get_db from app.db import get_db
from app.dependencies import get_current_user from app.dependencies import get_current_user
from app.models import User from app.models import User
from app.schemas import conversation_schema
from app.schemas.response_schema import ApiResponse from app.schemas.response_schema import ApiResponse
from app.services.conversation_service import ConversationService from app.services.conversation_service import ConversationService
@@ -90,11 +91,7 @@ def get_messages(
conversation_id, conversation_id,
) )
messages = [ messages = [
{ conversation_schema.Message.model_validate(message)
"role": message.role,
"content": message.content,
"created_at": int(message.created_at.timestamp() * 1000),
}
for message in messages_obj for message in messages_obj
] ]
return success(data=messages, msg="get conversation history success") return success(data=messages, msg="get conversation history success")

4
api/app/schemas/conversation_schema.py
View File

@@ -51,6 +51,10 @@ class Message(BaseModel):
def _serialize_created_at(self, dt: datetime.datetime): def _serialize_created_at(self, dt: datetime.datetime):
return int(dt.timestamp() * 1000) if dt else None return int(dt.timestamp() * 1000) if dt else None
@field_serializer("meta_data", when_used="json")
def _serialize_meta_data(self, data: Optional[Dict[str, Any]]):
return data or {}
class Conversation(BaseModel): class Conversation(BaseModel):
"""会话输出""" """会话输出"""

15
api/app/services/workflow_service.py
View File

@@ -802,30 +802,33 @@ class WorkflowService:
final_messages = event.get("data", {}).get("messages", [])[init_message_length:] final_messages = event.get("data", {}).get("messages", [])[init_message_length:]
human_message = "" human_message = ""
assistant_message = "" assistant_message = ""
human_meta = {
"files": []
}
for message in final_messages: for message in final_messages:
if message["role"] == "user": if message["role"] == "user":
if isinstance(message["content"], str): if isinstance(message["content"], str):
human_message += message["content"] human_message += message["content"]
elif isinstance(message["content"], list): elif isinstance(message["content"], list):
for file in message["content"]: for file in message["content"]:
if file.get("type") == FileType.IMAGE: human_meta["files"].append({
human_message += f"![image]({file.get('url', '')})" "type": file.get("type"),
else: "url": file.get("url")
human_message += f"[{file.get('type')}]({file.get('url', '')})" })
if message["role"] == "assistant": if message["role"] == "assistant":
assistant_message = message["content"] assistant_message = message["content"]
self.conversation_service.add_message( self.conversation_service.add_message(
conversation_id=conversation_id_uuid, conversation_id=conversation_id_uuid,
role="user", role="user",
content=human_message, content=human_message,
meta_data=None meta_data=human_meta
) )
self.conversation_service.add_message( self.conversation_service.add_message(
message_id=message_id, message_id=message_id,
conversation_id=conversation_id_uuid, conversation_id=conversation_id_uuid,
role="assistant", role="assistant",
content=assistant_message, content=assistant_message,
meta_data={"usage": token_usage} meta_data={"usage": token_usage, "audio_url": None}
) )
self.update_execution_status( self.update_execution_status(
execution.execution_id, execution.execution_id,