zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-02 05:47:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: consolidate page and page_size (#17597)

Browse Source
This commit is contained in:
Wang Qi
2026-07-31 14:08:44 +08:00
committed by GitHub
parent 67f027c306
commit 4b619f699b
18 changed files with 104 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
api/apps/restful_apis/memory_api.py
View File

@@ -24,7 +24,7 @@ from api.apps import login_required, current_user
from api.utils.api_utils import validate_request, get_request_json, get_error_argument_result, get_json_result
from api.apps.services import memory_api_service
from api.db.joint_services.tenant_model_service import ensure_tenant_model_ids_for_params
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
@manager.route("/memories", methods=["POST"]) # noqa: F821
@@ -38,12 +38,7 @@ async def create_memory():
try:
# Resolve tenant_model IDs from model names
tenant_id = current_user.id
memory_info = {
"name": req["name"],
"memory_type": req["memory_type"],
"embd_id": req["embd_id"],
"llm_id": req["llm_id"]
}
memory_info = {"name": req["name"], "memory_type": req["memory_type"], "embd_id": req["embd_id"], "llm_id": req["llm_id"]}
ensure_tenant_model_ids_for_params(tenant_id, memory_info)
success, res = await memory_api_service.create_memory(memory_info)
if timing_enabled:
@@ -90,10 +85,26 @@ async def update_memory(memory_id):
req = await get_request_json()
# Resolve tenant_model IDs from model names when name is provided but id is not
ensure_tenant_model_ids_for_params(current_user.id, req)
new_settings = {k: req[k] for k in [
"name", "permissions", "llm_id", "embd_id", "memory_type", "memory_size", "forgetting_policy", "temperature",
"avatar", "description", "system_prompt", "user_prompt", "tenant_llm_id", "tenant_embd_id"
] if k in req}
new_settings = {
k: req[k]
for k in [
"name",
"permissions",
"llm_id",
"embd_id",
"memory_type",
"memory_size",
"forgetting_policy",
"temperature",
"avatar",
"description",
"system_prompt",
"user_prompt",
"tenant_llm_id",
"tenant_embd_id",
]
if k in req
}
try:
success, res = await memory_api_service.update_memory(memory_id, new_settings)
if success:
@@ -130,8 +141,8 @@ async def delete_memory(memory_id):
async def list_memory():
filter_params = {k: request.args.get(k) for k in ["memory_type", "tenant_id", "owner_ids", "storage_type"] if k in request.args}
keywords = request.args.get("keywords")
page = int(request.args.get("page", 1))
page_size = validate_rest_api_page_size(int(request.args.get("page_size", 50)))
page = validate_rest_api_page(request.args.get("page", DEFAULT_PAGE))
page_size = validate_rest_api_page_size(request.args.get("page_size", DEFAULT_PAGE_SIZE))
try:
res = await memory_api_service.list_memory(filter_params, keywords, page, page_size)
return get_json_result(message=True, data=res)
@@ -163,8 +174,8 @@ async def get_memory_messages(memory_id):
agent_ids = agent_ids[0].split(",")
keywords = args.get("keywords", "")
keywords = keywords.strip()
page = int(args.get("page", 1))
page_size = validate_rest_api_page_size(int(args.get("page_size", 50)))
page = validate_rest_api_page(args.get("page", 1))
page_size = validate_rest_api_page_size(args.get("page_size", 50))
try:
res = await memory_api_service.get_memory_messages(memory_id, agent_ids, keywords, page, page_size)
return get_json_result(message=True, data=res)