scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-10-06 02:48:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: avoid 502 on admin feedback list by using lightweight count query

Browse source 
The admin feedback list endpoint (GET /api/v1/evaluations/feedbacks/list)
returned HTTP 502 on PostgreSQL. get_feedback_items() built the row count as
select(func.count()).select_from(stmt.subquery()), where stmt is a
select(Feedback, User) join carrying an ORDER BY on a JSON-extracted field
(Feedback.data['model_id'].as_string()). Wrapping that statement in a subquery
just to count rows forces PostgreSQL to materialize the JSON data column and
evaluate the JSON-cast ORDER BY, which surfaces as a 502.

Build a separate lightweight count statement that applies only the JOIN and the
WHERE filters (no ORDER BY, no entity/JSON columns), mirroring the pattern
already used in models/knowledge.py. Apply the same fix to
get_feedbacks_by_user_id, which shared the identical fragile pattern.
This commit is contained in:
Anneheartrecord 2026-06-13 21:40:11 +08:00
parent f85cb27ef8
commit c0a6fe532b
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
backend/open_webui/models/feedbacks.py
View file

@ -217,11 +217,20 @@ class FeedbackTable:
async with get_async_db_context(db) as db:
stmt = select(Feedback, User).join(User, Feedback.user_id == User.id)
# Lightweight count: JOIN + WHERE only, no ORDER BY and without
# selecting the JSON ``data`` column. Wrapping the full
# select(Feedback, User) + JSON-ORDER BY statement in a subquery
# just to count rows forces PostgreSQL to materialize the JSON
# column and evaluate the JSON-cast ORDER BY, which surfaces as a
# 502 on the admin feedback list endpoint. (#25953)
count_stmt = select(func.count(Feedback.id)).select_from(Feedback).join(User, Feedback.user_id == User.id)
if filter:
# Apply model_id filter (exact match)
model_id = filter.get('model_id')
if model_id:
stmt = stmt.filter(Feedback.data['model_id'].as_string() == model_id)
count_stmt = count_stmt.filter(Feedback.data['model_id'].as_string() == model_id)
order_by = filter.get('order_by')
direction = filter.get('direction')
@ -251,7 +260,7 @@ class FeedbackTable:
stmt = stmt.order_by(Feedback.created_at.desc())
# Count BEFORE pagination
count_result = await db.execute(select(func.count()).select_from(stmt.subquery()))
count_result = await db.execute(count_stmt)
total = count_result.scalar()
if skip:
@ -395,7 +404,15 @@ class FeedbackTable:
.order_by(Feedback.updated_at.desc())
)
count_result = await db.execute(select(func.count()).select_from(stmt.subquery()))
# Lightweight count: JOIN + WHERE only, no ORDER BY and without
# selecting the JSON ``data`` column (see get_feedback_items). (#25953)
count_stmt = (
select(func.count(Feedback.id))
.select_from(Feedback)
.join(User, Feedback.user_id == User.id)
.filter(Feedback.user_id == user_id)
)
count_result = await db.execute(count_stmt)
total = count_result.scalar()
if skip: