mirror of
https://github.com/open-webui/open-webui
synced 2025-05-18 04:15:07 +00:00
feat: leaderboard rating
This commit is contained in:
parent
ce85400817
commit
f6893edcc2
@ -147,21 +147,29 @@ class FeedbackTable:
|
|||||||
with get_db() as db:
|
with get_db() as db:
|
||||||
return [
|
return [
|
||||||
FeedbackModel.model_validate(feedback)
|
FeedbackModel.model_validate(feedback)
|
||||||
for feedback in db.query(Feedback).all()
|
for feedback in db.query(Feedback)
|
||||||
|
.order_by(Feedback.updated_at.desc())
|
||||||
|
.all()
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_feedbacks_by_type(self, type: str) -> list[FeedbackModel]:
|
def get_feedbacks_by_type(self, type: str) -> list[FeedbackModel]:
|
||||||
with get_db() as db:
|
with get_db() as db:
|
||||||
return [
|
return [
|
||||||
FeedbackModel.model_validate(feedback)
|
FeedbackModel.model_validate(feedback)
|
||||||
for feedback in db.query(Feedback).filter_by(type=type).all()
|
for feedback in db.query(Feedback)
|
||||||
|
.filter_by(type=type)
|
||||||
|
.order_by(Feedback.updated_at.desc())
|
||||||
|
.all()
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_feedbacks_by_user_id(self, user_id: str) -> list[FeedbackModel]:
|
def get_feedbacks_by_user_id(self, user_id: str) -> list[FeedbackModel]:
|
||||||
with get_db() as db:
|
with get_db() as db:
|
||||||
return [
|
return [
|
||||||
FeedbackModel.model_validate(feedback)
|
FeedbackModel.model_validate(feedback)
|
||||||
for feedback in db.query(Feedback).filter_by(user_id=user_id).all()
|
for feedback in db.query(Feedback)
|
||||||
|
.filter_by(user_id=user_id)
|
||||||
|
.order_by(Feedback.updated_at.desc())
|
||||||
|
.all()
|
||||||
]
|
]
|
||||||
|
|
||||||
def update_feedback_by_id(
|
def update_feedback_by_id(
|
||||||
|
@ -2,7 +2,7 @@ from typing import Optional
|
|||||||
from fastapi import APIRouter, Depends, HTTPException, status, Request
|
from fastapi import APIRouter, Depends, HTTPException, status, Request
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
from open_webui.apps.webui.models.users import Users, UserModel
|
||||||
from open_webui.apps.webui.models.feedbacks import (
|
from open_webui.apps.webui.models.feedbacks import (
|
||||||
FeedbackModel,
|
FeedbackModel,
|
||||||
FeedbackForm,
|
FeedbackForm,
|
||||||
@ -67,18 +67,27 @@ async def delete_feedbacks(user=Depends(get_verified_user)):
|
|||||||
return success
|
return success
|
||||||
|
|
||||||
|
|
||||||
|
class FeedbackUserModel(FeedbackModel):
|
||||||
|
user: Optional[UserModel] = None
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/feedbacks/all", response_model=list[FeedbackUserModel])
|
||||||
|
async def get_all_feedbacks(user=Depends(get_admin_user)):
|
||||||
|
feedbacks = Feedbacks.get_all_feedbacks()
|
||||||
|
return [
|
||||||
|
FeedbackUserModel(
|
||||||
|
**feedback.model_dump(), user=Users.get_user_by_id(feedback.user_id)
|
||||||
|
)
|
||||||
|
for feedback in feedbacks
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/feedbacks/all")
|
@router.delete("/feedbacks/all")
|
||||||
async def delete_all_feedbacks(user=Depends(get_admin_user)):
|
async def delete_all_feedbacks(user=Depends(get_admin_user)):
|
||||||
success = Feedbacks.delete_all_feedbacks()
|
success = Feedbacks.delete_all_feedbacks()
|
||||||
return success
|
return success
|
||||||
|
|
||||||
|
|
||||||
@router.get("/feedbacks/all", response_model=list[FeedbackModel])
|
|
||||||
async def get_all_feedbacks(user=Depends(get_admin_user)):
|
|
||||||
feedbacks = Feedbacks.get_all_feedbacks()
|
|
||||||
return feedbacks
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/feedback", response_model=FeedbackModel)
|
@router.post("/feedback", response_model=FeedbackModel)
|
||||||
async def create_feedback(
|
async def create_feedback(
|
||||||
request: Request,
|
request: Request,
|
||||||
|
@ -1,30 +1,107 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { onMount, getContext } from 'svelte';
|
import { onMount, getContext } from 'svelte';
|
||||||
|
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||||
|
dayjs.extend(relativeTime);
|
||||||
|
|
||||||
import { models } from '$lib/stores';
|
import { models } from '$lib/stores';
|
||||||
import GarbageBin from '../icons/GarbageBin.svelte';
|
import { getAllFeedbacks } from '$lib/apis/evaluations';
|
||||||
|
|
||||||
import FeedbackMenu from './Evaluations/FeedbackMenu.svelte';
|
import FeedbackMenu from './Evaluations/FeedbackMenu.svelte';
|
||||||
import EllipsisHorizontal from '../icons/EllipsisHorizontal.svelte';
|
import EllipsisHorizontal from '../icons/EllipsisHorizontal.svelte';
|
||||||
import { getAllFeedbacks } from '$lib/apis/evaluations';
|
import Tooltip from '../common/Tooltip.svelte';
|
||||||
|
import Badge from '../common/Badge.svelte';
|
||||||
|
|
||||||
const i18n = getContext('i18n');
|
const i18n = getContext('i18n');
|
||||||
|
|
||||||
let rankedModels = [];
|
let rankedModels = [];
|
||||||
let feedbacks = [];
|
let feedbacks = [];
|
||||||
|
|
||||||
|
type Feedback = {
|
||||||
|
model_id: string;
|
||||||
|
sibling_model_ids?: string[];
|
||||||
|
rating: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
type ModelStats = {
|
||||||
|
rating: number;
|
||||||
|
won: number;
|
||||||
|
draw: number;
|
||||||
|
lost: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
function calculateModelStats(feedbacks: Feedback[]): Map<string, ModelStats> {
|
||||||
|
const stats = new Map<string, ModelStats>();
|
||||||
|
const K = 32;
|
||||||
|
|
||||||
|
function getOrDefaultStats(modelId: string): ModelStats {
|
||||||
|
return stats.get(modelId) || { rating: 1000, won: 0, draw: 0, lost: 0 };
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateStats(modelId: string, ratingChange: number, outcome: number) {
|
||||||
|
const currentStats = getOrDefaultStats(modelId);
|
||||||
|
currentStats.rating += ratingChange;
|
||||||
|
if (outcome === 1) currentStats.won++;
|
||||||
|
else if (outcome === 0.5) currentStats.draw++;
|
||||||
|
else if (outcome === 0) currentStats.lost++;
|
||||||
|
stats.set(modelId, currentStats);
|
||||||
|
}
|
||||||
|
|
||||||
|
function calculateEloChange(ratingA: number, ratingB: number, outcome: number): number {
|
||||||
|
const expectedScore = 1 / (1 + Math.pow(10, (ratingB - ratingA) / 400));
|
||||||
|
return K * (outcome - expectedScore);
|
||||||
|
}
|
||||||
|
|
||||||
|
feedbacks.forEach((feedback) => {
|
||||||
|
const modelA = feedback.data.model_id;
|
||||||
|
const statsA = getOrDefaultStats(modelA);
|
||||||
|
let outcome: number;
|
||||||
|
|
||||||
|
switch (feedback.data.rating.toString()) {
|
||||||
|
case '1':
|
||||||
|
outcome = 1;
|
||||||
|
break;
|
||||||
|
case '0':
|
||||||
|
outcome = 0.5;
|
||||||
|
break;
|
||||||
|
case '-1':
|
||||||
|
outcome = 0;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return; // Skip invalid ratings
|
||||||
|
}
|
||||||
|
|
||||||
|
const opponents = feedback.data.sibling_model_ids || [];
|
||||||
|
opponents.forEach((modelB) => {
|
||||||
|
const statsB = getOrDefaultStats(modelB);
|
||||||
|
const changeA = calculateEloChange(statsA.rating, statsB.rating, outcome);
|
||||||
|
const changeB = calculateEloChange(statsB.rating, statsA.rating, 1 - outcome);
|
||||||
|
|
||||||
|
updateStats(modelA, changeA, outcome);
|
||||||
|
updateStats(modelB, changeB, 1 - outcome);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return stats;
|
||||||
|
}
|
||||||
|
|
||||||
let loaded = false;
|
let loaded = false;
|
||||||
onMount(async () => {
|
onMount(async () => {
|
||||||
feedbacks = await getAllFeedbacks(localStorage.token);
|
feedbacks = await getAllFeedbacks(localStorage.token);
|
||||||
|
const modelStats = calculateModelStats(feedbacks);
|
||||||
|
|
||||||
rankedModels = $models
|
rankedModels = $models
|
||||||
.filter((m) => m?.owned_by !== 'arena' && (m?.info?.meta?.hidden ?? false) !== true)
|
.filter((m) => m?.owned_by !== 'arena' && (m?.info?.meta?.hidden ?? false) !== true)
|
||||||
.map((model) => {
|
.map((model) => {
|
||||||
|
const stats = modelStats.get(model.name);
|
||||||
return {
|
return {
|
||||||
...model,
|
...model,
|
||||||
ranking: '-',
|
rating: stats ? Math.round(stats.rating) : '-',
|
||||||
rating: '-',
|
|
||||||
stats: {
|
stats: {
|
||||||
won: '-',
|
won: stats ? stats.won.toString() : '-',
|
||||||
draw: '-',
|
draw: stats ? stats.draw.toString() : '-',
|
||||||
lost: '-'
|
lost: stats ? stats.lost.toString() : '-'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
@ -93,11 +170,11 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="">
|
<tbody class="">
|
||||||
{#each rankedModels as model (model.id)}
|
{#each rankedModels as model, modelIdx (model.id)}
|
||||||
<tr class="bg-white dark:bg-gray-900 dark:border-gray-850 text-xs">
|
<tr class="bg-white dark:bg-gray-900 dark:border-gray-850 text-xs">
|
||||||
<td class="px-3 py-1.5 text-left font-medium text-gray-900 dark:text-white w-fit">
|
<td class="px-3 py-1.5 text-left font-medium text-gray-900 dark:text-white w-fit">
|
||||||
<div class=" line-clamp-1">
|
<div class=" line-clamp-1">
|
||||||
{model.ranking}
|
{model?.rating !== '-' ? modelIdx + 1 : '-'}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="px-3 py-1.5 flex flex-col justify-center">
|
<td class="px-3 py-1.5 flex flex-col justify-center">
|
||||||
@ -160,6 +237,10 @@
|
|||||||
class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-850 dark:text-gray-400 -translate-y-0.5"
|
class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-850 dark:text-gray-400 -translate-y-0.5"
|
||||||
>
|
>
|
||||||
<tr class="">
|
<tr class="">
|
||||||
|
<th scope="col" class="px-3 py-1.5 text-right cursor-pointer select-none w-0">
|
||||||
|
{$i18n.t('User')}
|
||||||
|
</th>
|
||||||
|
|
||||||
<th scope="col" class="px-3 py-1.5 cursor-pointer select-none">
|
<th scope="col" class="px-3 py-1.5 cursor-pointer select-none">
|
||||||
{$i18n.t('Models')}
|
{$i18n.t('Models')}
|
||||||
</th>
|
</th>
|
||||||
@ -169,11 +250,7 @@
|
|||||||
</th>
|
</th>
|
||||||
|
|
||||||
<th scope="col" class="px-3 py-1.5 text-right cursor-pointer select-none w-0">
|
<th scope="col" class="px-3 py-1.5 text-right cursor-pointer select-none w-0">
|
||||||
{$i18n.t('User')}
|
{$i18n.t('Updated At')}
|
||||||
</th>
|
|
||||||
|
|
||||||
<th scope="col" class="px-3 py-1.5 text-right cursor-pointer select-none w-0">
|
|
||||||
{$i18n.t('Created At')}
|
|
||||||
</th>
|
</th>
|
||||||
|
|
||||||
<th scope="col" class="px-3 py-1.5 text-right cursor-pointer select-none w-0"> </th>
|
<th scope="col" class="px-3 py-1.5 text-right cursor-pointer select-none w-0"> </th>
|
||||||
@ -182,24 +259,54 @@
|
|||||||
<tbody class="">
|
<tbody class="">
|
||||||
{#each feedbacks as feedback (feedback.id)}
|
{#each feedbacks as feedback (feedback.id)}
|
||||||
<tr class="bg-white dark:bg-gray-900 dark:border-gray-850 text-xs">
|
<tr class="bg-white dark:bg-gray-900 dark:border-gray-850 text-xs">
|
||||||
<td class="px-3 py-1 flex flex-col">
|
<td class=" py-1 text-right font-semibold">
|
||||||
<div class="flex flex-col items-start gap-1">
|
<div class="flex justify-center">
|
||||||
<div class="font-medium text-gray-600 dark:text-gray-400">
|
<Tooltip content={feedback?.user?.name}>
|
||||||
{model.name}
|
<div class="flex-shrink-0">
|
||||||
|
<img
|
||||||
|
src={feedback?.user?.profile_image_url ?? '/user.png'}
|
||||||
|
alt={feedback?.user?.name}
|
||||||
|
class="size-6 rounded-full object-cover shrink-0"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="font-medium text-gray-600 dark:text-gray-400">
|
</Tooltip>
|
||||||
{model.name}
|
</div>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td class="px-3 py-1 flex flex-col">
|
||||||
|
<div class="flex flex-col items-start gap-0.5 h-full">
|
||||||
|
<div class="flex flex-col h-full">
|
||||||
|
{#if feedback.data?.sibling_model_ids}
|
||||||
|
<div class="font-semibold text-gray-600 dark:text-gray-400 flex-1">
|
||||||
|
{feedback.data?.model_id}
|
||||||
|
</div>
|
||||||
|
<div class=" text-[0.65rem] text-gray-600 dark:text-gray-400 line-clamp-1">
|
||||||
|
{feedback.data.sibling_model_ids.join(', ')}
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div
|
||||||
|
class=" text-sm font-medium text-gray-600 dark:text-gray-400 flex-1 py-2"
|
||||||
|
>
|
||||||
|
{feedback.data?.model_id}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="px-3 py-1 text-right font-medium text-gray-900 dark:text-white w-max">
|
<td class="px-3 py-1 text-right font-medium text-gray-900 dark:text-white w-max">
|
||||||
{model.rating}
|
<div class=" flex justify-end">
|
||||||
|
{#if feedback.data.rating.toString() === '1'}
|
||||||
|
<Badge type="info" content={$i18n.t('Won')} />
|
||||||
|
{:else if feedback.data.rating.toString() === '0'}
|
||||||
|
<Badge type="muted" content={$i18n.t('Draw')} />
|
||||||
|
{:else if feedback.data.rating.toString() === '-1'}
|
||||||
|
<Badge type="error" content={$i18n.t('Lost')} />
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class=" px-3 py-1 text-right font-semibold"> {model.stats.won} </td>
|
<td class=" px-3 py-1 text-right font-medium">
|
||||||
|
{dayjs(feedback.updated_at * 1000).fromNow()}
|
||||||
<td class=" px-3 py-1 text-right font-semibold">
|
|
||||||
{model.stats.draw}
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class=" px-3 py-1 text-right font-semibold">
|
<td class=" px-3 py-1 text-right font-semibold">
|
||||||
|
Loading…
Reference in New Issue
Block a user