Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>tags/1.7.2
| @@ -5,7 +5,6 @@ from flask_restful import Resource, fields, marshal_with, reqparse | |||
| from flask_restful.inputs import int_range | |||
| from werkzeug.exceptions import Forbidden, InternalServerError, NotFound | |||
| import services | |||
| from controllers.console import api | |||
| from controllers.console.app.error import ( | |||
| CompletionRequestError, | |||
| @@ -133,7 +132,7 @@ class MessageFeedbackApi(Resource): | |||
| rating=args.get("rating"), | |||
| content=None, | |||
| ) | |||
| except services.errors.message.MessageNotExistsError: | |||
| except MessageNotExistsError: | |||
| raise NotFound("Message Not Exists.") | |||
| return {"result": "success"} | |||
| @@ -5,7 +5,6 @@ from flask_restful import marshal_with, reqparse | |||
| from flask_restful.inputs import int_range | |||
| from werkzeug.exceptions import InternalServerError, NotFound | |||
| import services | |||
| from controllers.console.app.error import ( | |||
| AppMoreLikeThisDisabledError, | |||
| CompletionRequestError, | |||
| @@ -29,7 +28,11 @@ from models.model import AppMode | |||
| from services.app_generate_service import AppGenerateService | |||
| from services.errors.app import MoreLikeThisDisabledError | |||
| from services.errors.conversation import ConversationNotExistsError | |||
| from services.errors.message import MessageNotExistsError, SuggestedQuestionsAfterAnswerDisabledError | |||
| from services.errors.message import ( | |||
| FirstMessageNotExistsError, | |||
| MessageNotExistsError, | |||
| SuggestedQuestionsAfterAnswerDisabledError, | |||
| ) | |||
| from services.message_service import MessageService | |||
| @@ -52,9 +55,9 @@ class MessageListApi(InstalledAppResource): | |||
| return MessageService.pagination_by_first_id( | |||
| app_model, current_user, args["conversation_id"], args["first_id"], args["limit"] | |||
| ) | |||
| except services.errors.conversation.ConversationNotExistsError: | |||
| except ConversationNotExistsError: | |||
| raise NotFound("Conversation Not Exists.") | |||
| except services.errors.message.FirstMessageNotExistsError: | |||
| except FirstMessageNotExistsError: | |||
| raise NotFound("First Message Not Exists.") | |||
| @@ -77,7 +80,7 @@ class MessageFeedbackApi(InstalledAppResource): | |||
| rating=args.get("rating"), | |||
| content=args.get("content"), | |||
| ) | |||
| except services.errors.message.MessageNotExistsError: | |||
| except MessageNotExistsError: | |||
| raise NotFound("Message Not Exists.") | |||
| return {"result": "success"} | |||
| @@ -15,7 +15,11 @@ from fields.message_fields import agent_thought_fields, feedback_fields | |||
| from fields.raws import FilesContainedField | |||
| from libs.helper import TimestampField, uuid_value | |||
| from models.model import App, AppMode, EndUser | |||
| from services.errors.message import SuggestedQuestionsAfterAnswerDisabledError | |||
| from services.errors.message import ( | |||
| FirstMessageNotExistsError, | |||
| MessageNotExistsError, | |||
| SuggestedQuestionsAfterAnswerDisabledError, | |||
| ) | |||
| from services.message_service import MessageService | |||
| @@ -65,7 +69,7 @@ class MessageListApi(Resource): | |||
| ) | |||
| except services.errors.conversation.ConversationNotExistsError: | |||
| raise NotFound("Conversation Not Exists.") | |||
| except services.errors.message.FirstMessageNotExistsError: | |||
| except FirstMessageNotExistsError: | |||
| raise NotFound("First Message Not Exists.") | |||
| @@ -87,7 +91,7 @@ class MessageFeedbackApi(Resource): | |||
| rating=args.get("rating"), | |||
| content=args.get("content"), | |||
| ) | |||
| except services.errors.message.MessageNotExistsError: | |||
| except MessageNotExistsError: | |||
| raise NotFound("Message Not Exists.") | |||
| return {"result": "success"} | |||
| @@ -117,7 +121,7 @@ class MessageSuggestedApi(Resource): | |||
| questions = MessageService.get_suggested_questions_after_answer( | |||
| app_model=app_model, user=end_user, message_id=message_id, invoke_from=InvokeFrom.SERVICE_API | |||
| ) | |||
| except services.errors.message.MessageNotExistsError: | |||
| except MessageNotExistsError: | |||
| raise NotFound("Message Not Exists.") | |||
| except SuggestedQuestionsAfterAnswerDisabledError: | |||
| raise BadRequest("Suggested Questions Is Disabled.") | |||
| @@ -4,7 +4,6 @@ from flask_restful import fields, marshal_with, reqparse | |||
| from flask_restful.inputs import int_range | |||
| from werkzeug.exceptions import InternalServerError, NotFound | |||
| import services | |||
| from controllers.web import api | |||
| from controllers.web.error import ( | |||
| AppMoreLikeThisDisabledError, | |||
| @@ -29,7 +28,11 @@ from models.model import AppMode | |||
| from services.app_generate_service import AppGenerateService | |||
| from services.errors.app import MoreLikeThisDisabledError | |||
| from services.errors.conversation import ConversationNotExistsError | |||
| from services.errors.message import MessageNotExistsError, SuggestedQuestionsAfterAnswerDisabledError | |||
| from services.errors.message import ( | |||
| FirstMessageNotExistsError, | |||
| MessageNotExistsError, | |||
| SuggestedQuestionsAfterAnswerDisabledError, | |||
| ) | |||
| from services.message_service import MessageService | |||
| @@ -73,9 +76,9 @@ class MessageListApi(WebApiResource): | |||
| return MessageService.pagination_by_first_id( | |||
| app_model, end_user, args["conversation_id"], args["first_id"], args["limit"] | |||
| ) | |||
| except services.errors.conversation.ConversationNotExistsError: | |||
| except ConversationNotExistsError: | |||
| raise NotFound("Conversation Not Exists.") | |||
| except services.errors.message.FirstMessageNotExistsError: | |||
| except FirstMessageNotExistsError: | |||
| raise NotFound("First Message Not Exists.") | |||
| @@ -96,7 +99,7 @@ class MessageFeedbackApi(WebApiResource): | |||
| rating=args.get("rating"), | |||
| content=args.get("content"), | |||
| ) | |||
| except services.errors.message.MessageNotExistsError: | |||
| except MessageNotExistsError: | |||
| raise NotFound("Message Not Exists.") | |||
| return {"result": "success"} | |||