fix: some api bugs

api/controllers/console/explore/conversation.py

@@ -65,7 +65,10 @@ class ConversationApi(InstalledAppResource):
             raise NotChatAppError()
 
         conversation_id = str(c_id)
-        ConversationService.delete(app_model, conversation_id, current_user)
+        try:
+            ConversationService.delete(app_model, conversation_id, current_user)
+        except ConversationNotExistsError:
+            raise NotFound("Conversation Not Exists.")
         WebConversationService.unpin(app_model, conversation_id, current_user)
 
         return {"result": "success"}, 204

api/controllers/console/universal_chat/conversation.py

@@ -18,7 +18,7 @@ conversation_fields = {
     'status': fields.String,
     'introduction': fields.String,
     'created_at': TimestampField,
-    'agent_mode': fields.Raw,  # todo ADD AGENT MODE INFO
+    'model_config': fields.Raw,
 }
 
 conversation_infinite_scroll_pagination_fields = {
@@ -60,7 +60,12 @@ class UniversalChatConversationApi(UniversalChatResource):
     def delete(self, universal_app, c_id):
         app_model = universal_app
         conversation_id = str(c_id)
-        ConversationService.delete(app_model, conversation_id, current_user)
+
+        try:
+            ConversationService.delete(app_model, conversation_id, current_user)
+        except ConversationNotExistsError:
+            raise NotFound("Conversation Not Exists.")
+
         WebConversationService.unpin(app_model, conversation_id, current_user)
 
         return {"result": "success"}, 204
@@ -110,4 +115,4 @@ api.add_resource(UniversalChatConversationRenameApi, '/universal-chat/conversati
 api.add_resource(UniversalChatConversationListApi, '/universal-chat/conversations')
 api.add_resource(UniversalChatConversationApi, '/universal-chat/conversations/<uuid:c_id>')
 api.add_resource(UniversalChatConversationPinApi, '/universal-chat/conversations/<uuid:c_id>/pin')
-api.add_resource(UniversalChatConversationUnPinApi, '/universal-chat>/conversations/<uuid:c_id>/unpin')
+api.add_resource(UniversalChatConversationUnPinApi, '/universal-chat/conversations/<uuid:c_id>/unpin')

api/controllers/console/universal_chat/message.py

@@ -25,6 +25,17 @@ class UniversalChatMessageListApi(UniversalChatResource):
         'rating': fields.String
     }
 
+    agent_thought_fields = {
+        'id': fields.String,
+        'chain_id': fields.String,
+        'message_id': fields.String,
+        'position': fields.Integer,
+        'thought': fields.String,
+        'tool': fields.String,
+        'tool_input': fields.String,
+        'created_at': TimestampField
+    }
+
     message_fields = {
         'id': fields.String,
         'conversation_id': fields.String,
@@ -33,7 +44,7 @@ class UniversalChatMessageListApi(UniversalChatResource):
         'answer': fields.String,
         'feedback': fields.Nested(feedback_fields, attribute='user_feedback', allow_null=True),
         'created_at': TimestampField,
-        'agent_thought': fields.Raw,  # TODO ADD agent_thought
+        'agent_thoughts': fields.List(fields.Nested(agent_thought_fields))
     }
 
     message_infinite_scroll_pagination_fields = {

api/controllers/web/conversation.py

@@ -62,7 +62,10 @@ class ConversationApi(WebApiResource):
             raise NotChatAppError()
 
         conversation_id = str(c_id)
-        ConversationService.delete(app_model, conversation_id, end_user)
+        try:
+            ConversationService.delete(app_model, conversation_id, end_user)
+        except ConversationNotExistsError:
+            raise NotFound("Conversation Not Exists.")
         WebConversationService.unpin(app_model, conversation_id, end_user)
 
         return {"result": "success"}, 204

api/models/model.py

@@ -418,6 +418,11 @@ class Message(db.Model):
     def in_debug_mode(self):
         return self.override_model_configs is not None
 
+    @property
+    def agent_thoughts(self):
+        return db.session.query(MessageAgentThought).filter(MessageAgentThought.message_id == self.id)\
+            .order_by(MessageAgentThought.position.asc()).all()
+
 
 class MessageFeedback(db.Model):
     __tablename__ = 'message_feedbacks'