Skip to content

Commit 11e95d2

Browse files
liguochuan00crazywoolaCopilot
authored
Fix (api): Fix the processing logic of the retriever_resources field. (langgenius#17304)
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent abaefe2 commit 11e95d2

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

api/controllers/service_api/app/message.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import json
12
import logging
23

34
from flask_restful import Resource, fields, marshal_with, reqparse # type: ignore
@@ -10,7 +11,7 @@
1011
from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
1112
from core.app.entities.app_invoke_entities import InvokeFrom
1213
from fields.conversation_fields import message_file_fields
13-
from fields.message_fields import agent_thought_fields, feedback_fields, retriever_resource_fields
14+
from fields.message_fields import agent_thought_fields, feedback_fields
1415
from fields.raws import FilesContainedField
1516
from libs.helper import TimestampField, uuid_value
1617
from models.model import App, AppMode, EndUser
@@ -19,6 +20,14 @@
1920

2021

2122
class MessageListApi(Resource):
23+
def get_retriever_resources(self):
24+
try:
25+
if self.message_metadata:
26+
return json.loads(self.message_metadata).get("retriever_resources", [])
27+
return []
28+
except (json.JSONDecodeError, TypeError):
29+
return []
30+
2231
message_fields = {
2332
"id": fields.String,
2433
"conversation_id": fields.String,
@@ -28,7 +37,7 @@ class MessageListApi(Resource):
2837
"answer": fields.String(attribute="re_sign_file_url_answer"),
2938
"message_files": fields.List(fields.Nested(message_file_fields)),
3039
"feedback": fields.Nested(feedback_fields, attribute="user_feedback", allow_null=True),
31-
"retriever_resources": fields.List(fields.Nested(retriever_resource_fields)),
40+
"retriever_resources": get_retriever_resources,
3241
"created_at": TimestampField,
3342
"agent_thoughts": fields.List(fields.Nested(agent_thought_fields)),
3443
"status": fields.String,

0 commit comments

Comments
 (0)