pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2026-01-31 15:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feat: adapt to , arglist (#12468)

Browse Source 
### What problem does this PR solve?

Adapt to ',' joined arg list in get method url.

### Type of change

- [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
Lynn
2026-01-07 09:59:08 +08:00
committed by GitHub
parent 8e03843145
commit ca9645f39b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/apps/memories_app.py
View File

@ -180,13 +180,18 @@ async def list_memory():
page = int(args.get("page", 1)) page = int(args.get("page", 1))
page_size = int(args.get("page_size", 50)) page_size = int(args.get("page_size", 50))
# make filter dict # make filter dict
filter_dict = {"memory_type": memory_types, "storage_type": storage_type} filter_dict: dict = {"storage_type": storage_type}
if not tenant_ids: if not tenant_ids:
# restrict to current user's tenants # restrict to current user's tenants
user_tenants = UserTenantService.get_user_tenant_relation_by_user_id(current_user.id) user_tenants = UserTenantService.get_user_tenant_relation_by_user_id(current_user.id)
filter_dict["tenant_id"] = [tenant["tenant_id"] for tenant in user_tenants] filter_dict["tenant_id"] = [tenant["tenant_id"] for tenant in user_tenants]
else: else:
if len(tenant_ids) == 1 and ',' in tenant_ids[0]:
tenant_ids = tenant_ids[0].split(',')
filter_dict["tenant_id"] = tenant_ids filter_dict["tenant_id"] = tenant_ids
if memory_types and len(memory_types) == 1 and ',' in memory_types[0]:
memory_types = memory_types[0].split(',')
filter_dict["memory_type"] = memory_types
memory_list, count = MemoryService.get_by_filter(filter_dict, keywords, page, page_size) memory_list, count = MemoryService.get_by_filter(filter_dict, keywords, page, page_size)
[memory.update({"memory_type": get_memory_type_human(memory["memory_type"])}) for memory in memory_list] [memory.update({"memory_type": get_memory_type_human(memory["memory_type"])}) for memory in memory_list]
@ -211,6 +216,8 @@ async def get_memory_config(memory_id):
async def get_memory_detail(memory_id): async def get_memory_detail(memory_id):
args = request.args args = request.args
agent_ids = args.getlist("agent_id") agent_ids = args.getlist("agent_id")
if len(agent_ids) == 1 and ',' in agent_ids[0]:
agent_ids = agent_ids[0].split(',')
keywords = args.get("keywords", "") keywords = args.get("keywords", "")
keywords = keywords.strip() keywords = keywords.strip()
page = int(args.get("page", 1)) page = int(args.get("page", 1))

5
api/apps/messages_app.py
View File

@ -104,12 +104,13 @@ async def update_message(memory_id: str, message_id: int):
@login_required @login_required
async def search_message(): async def search_message():
args = request.args args = request.args
print(args, flush=True)
empty_fields = [f for f in ["memory_id", "query"] if not args.get(f)] empty_fields = [f for f in ["memory_id", "query"] if not args.get(f)]
if empty_fields: if empty_fields:
return get_error_argument_result(f"{', '.join(empty_fields)} can't be empty.") return get_error_argument_result(f"{', '.join(empty_fields)} can't be empty.")
memory_ids = args.getlist("memory_id") memory_ids = args.getlist("memory_id")
if len(memory_ids) == 1 and ',' in memory_ids[0]:
memory_ids = memory_ids[0].split(',')
query = args.get("query") query = args.get("query")
similarity_threshold = float(args.get("similarity_threshold", 0.2)) similarity_threshold = float(args.get("similarity_threshold", 0.2))
keywords_similarity_weight = float(args.get("keywords_similarity_weight", 0.7)) keywords_similarity_weight = float(args.get("keywords_similarity_weight", 0.7))
@ -137,6 +138,8 @@ async def search_message():
async def get_messages(): async def get_messages():
args = request.args args = request.args
memory_ids = args.getlist("memory_id") memory_ids = args.getlist("memory_id")
if len(memory_ids) == 1 and ',' in memory_ids[0]:
memory_ids = memory_ids[0].split(',')
agent_id = args.get("agent_id", "") agent_id = args.get("agent_id", "")
session_id = args.get("session_id", "") session_id = args.get("session_id", "")
limit = int(args.get("limit", 10)) limit = int(args.get("limit", 10))