mirror of
https://github.com/langgenius/dify.git
synced 2026-04-05 16:39:26 +08:00
refactor: split changes for api/controllers/web/saved_message.py (#30583)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
@@ -1,18 +1,30 @@
|
|||||||
from flask_restx import reqparse
|
from flask import request
|
||||||
from flask_restx.inputs import int_range
|
from pydantic import BaseModel, Field, TypeAdapter
|
||||||
from pydantic import TypeAdapter
|
|
||||||
from werkzeug.exceptions import NotFound
|
from werkzeug.exceptions import NotFound
|
||||||
|
|
||||||
|
from controllers.common.schema import register_schema_models
|
||||||
from controllers.web import web_ns
|
from controllers.web import web_ns
|
||||||
from controllers.web.error import NotCompletionAppError
|
from controllers.web.error import NotCompletionAppError
|
||||||
from controllers.web.wraps import WebApiResource
|
from controllers.web.wraps import WebApiResource
|
||||||
from fields.conversation_fields import ResultResponse
|
from fields.conversation_fields import ResultResponse
|
||||||
from fields.message_fields import SavedMessageInfiniteScrollPagination, SavedMessageItem
|
from fields.message_fields import SavedMessageInfiniteScrollPagination, SavedMessageItem
|
||||||
from libs.helper import uuid_value
|
from libs.helper import UUIDStrOrEmpty
|
||||||
from services.errors.message import MessageNotExistsError
|
from services.errors.message import MessageNotExistsError
|
||||||
from services.saved_message_service import SavedMessageService
|
from services.saved_message_service import SavedMessageService
|
||||||
|
|
||||||
|
|
||||||
|
class SavedMessageListQuery(BaseModel):
|
||||||
|
last_id: UUIDStrOrEmpty | None = None
|
||||||
|
limit: int = Field(default=20, ge=1, le=100)
|
||||||
|
|
||||||
|
|
||||||
|
class SavedMessageCreatePayload(BaseModel):
|
||||||
|
message_id: UUIDStrOrEmpty
|
||||||
|
|
||||||
|
|
||||||
|
register_schema_models(web_ns, SavedMessageListQuery, SavedMessageCreatePayload)
|
||||||
|
|
||||||
|
|
||||||
@web_ns.route("/saved-messages")
|
@web_ns.route("/saved-messages")
|
||||||
class SavedMessageListApi(WebApiResource):
|
class SavedMessageListApi(WebApiResource):
|
||||||
@web_ns.doc("Get Saved Messages")
|
@web_ns.doc("Get Saved Messages")
|
||||||
@@ -42,14 +54,10 @@ class SavedMessageListApi(WebApiResource):
|
|||||||
if app_model.mode != "completion":
|
if app_model.mode != "completion":
|
||||||
raise NotCompletionAppError()
|
raise NotCompletionAppError()
|
||||||
|
|
||||||
parser = (
|
raw_args = request.args.to_dict()
|
||||||
reqparse.RequestParser()
|
query = SavedMessageListQuery.model_validate(raw_args)
|
||||||
.add_argument("last_id", type=uuid_value, location="args")
|
|
||||||
.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
|
|
||||||
)
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
pagination = SavedMessageService.pagination_by_last_id(app_model, end_user, args["last_id"], args["limit"])
|
pagination = SavedMessageService.pagination_by_last_id(app_model, end_user, query.last_id, query.limit)
|
||||||
adapter = TypeAdapter(SavedMessageItem)
|
adapter = TypeAdapter(SavedMessageItem)
|
||||||
items = [adapter.validate_python(message, from_attributes=True) for message in pagination.data]
|
items = [adapter.validate_python(message, from_attributes=True) for message in pagination.data]
|
||||||
return SavedMessageInfiniteScrollPagination(
|
return SavedMessageInfiniteScrollPagination(
|
||||||
@@ -79,11 +87,10 @@ class SavedMessageListApi(WebApiResource):
|
|||||||
if app_model.mode != "completion":
|
if app_model.mode != "completion":
|
||||||
raise NotCompletionAppError()
|
raise NotCompletionAppError()
|
||||||
|
|
||||||
parser = reqparse.RequestParser().add_argument("message_id", type=uuid_value, required=True, location="json")
|
payload = SavedMessageCreatePayload.model_validate(web_ns.payload or {})
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
SavedMessageService.save(app_model, end_user, args["message_id"])
|
SavedMessageService.save(app_model, end_user, payload.message_id)
|
||||||
except MessageNotExistsError:
|
except MessageNotExistsError:
|
||||||
raise NotFound("Message Not Exists.")
|
raise NotFound("Message Not Exists.")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user