mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-08-02 05:47:31 +08:00
Refactor: consolidate page and page_size (#17597)
This commit is contained in:
@@ -60,7 +60,7 @@ from api.utils.api_utils import (
|
||||
get_error_argument_result,
|
||||
check_duplicate_ids,
|
||||
)
|
||||
from api.utils.pagination_utils import validate_rest_api_page_size
|
||||
from api.utils.pagination_utils import DEFAULT_PAGE, DEFAULT_PAGE_SIZE, validate_rest_api_page, validate_rest_api_page_size
|
||||
from api.utils.validation_utils import (
|
||||
UpdateDocumentReq,
|
||||
format_validation_error_message,
|
||||
@@ -862,19 +862,8 @@ def _get_docs_with_request(req, dataset_id: str):
|
||||
|
||||
# Invalid or negative pagination values fall back to defaults
|
||||
# instead of leaking internal conversion/SQL errors.
|
||||
try:
|
||||
page = int(q.get("page", 1))
|
||||
except (TypeError, ValueError):
|
||||
page = 1
|
||||
if page < 1:
|
||||
page = 1
|
||||
try:
|
||||
parsed_page_size = int(q.get("page_size", 30))
|
||||
except (TypeError, ValueError):
|
||||
parsed_page_size = 30
|
||||
if parsed_page_size < 0:
|
||||
parsed_page_size = 30
|
||||
page_size = validate_rest_api_page_size(parsed_page_size)
|
||||
page = validate_rest_api_page(q.get("page", DEFAULT_PAGE))
|
||||
page_size = validate_rest_api_page_size(q.get("page_size", DEFAULT_PAGE_SIZE))
|
||||
|
||||
orderby = q.get("orderby", "create_time")
|
||||
if orderby not in ("create_time", "update_time", "name"):
|
||||
|
||||
Reference in New Issue
Block a user