enh: auto tag feedback

This commit is contained in:
Timothy J. Baek 2024-10-23 20:18:51 -07:00
parent 73ab84efe6
commit 076f9fd9c0
9 changed files with 132 additions and 52 deletions

View File

@ -3,6 +3,7 @@
import { createEventDispatcher, onMount, getContext } from 'svelte'; import { createEventDispatcher, onMount, getContext } from 'svelte';
import { config, models } from '$lib/stores'; import { config, models } from '$lib/stores';
import Tags from '$lib/components/common/Tags.svelte';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
@ -14,24 +15,28 @@
let LIKE_REASONS = []; let LIKE_REASONS = [];
let DISLIKE_REASONS = []; let DISLIKE_REASONS = [];
let tags = [];
function loadReasons() { function loadReasons() {
LIKE_REASONS = [ LIKE_REASONS = [
$i18n.t('Accurate information'), 'accurate_information',
$i18n.t('Followed instructions perfectly'), 'followed_instructions_perfectly',
$i18n.t('Showcased creativity'), 'showcased_creativity',
$i18n.t('Positive attitude'), 'positive_attitude',
$i18n.t('Attention to detail'), 'attention_to_detail',
$i18n.t('Thorough explanation'), 'thorough_explanation',
$i18n.t('Other') 'other'
]; ];
DISLIKE_REASONS = [ DISLIKE_REASONS = [
$i18n.t("Don't like the style"), 'dont_like_the_style',
$i18n.t('Not factually correct'), 'too_verbose',
$i18n.t("Didn't fully follow instructions"), 'not_helpful',
$i18n.t("Refused when it shouldn't have"), 'not_factually_correct',
$i18n.t('Being lazy'), 'didnt_fully_follow_instructions',
$i18n.t('Other') 'refused_when_it_shouldnt_have',
'being_lazy',
'other'
]; ];
} }
@ -50,6 +55,9 @@
onMount(() => { onMount(() => {
selectedReason = message?.annotation?.reason ?? ''; selectedReason = message?.annotation?.reason ?? '';
comment = message?.annotation?.comment ?? ''; comment = message?.annotation?.comment ?? '';
tags = (message?.annotation?.tags ?? []).map((tag) => ({
name: tag
}));
if (message?.arena) { if (message?.arena) {
selectedModel = $models.find((m) => m.id === message.selectedModelId); selectedModel = $models.find((m) => m.id === message.selectedModelId);
@ -66,14 +74,15 @@
const saveHandler = () => { const saveHandler = () => {
console.log('saveHandler'); console.log('saveHandler');
if (!selectedReason) { // if (!selectedReason) {
toast.error($i18n.t('Please select a reason')); // toast.error($i18n.t('Please select a reason'));
return; // return;
} // }
dispatch('save', { dispatch('save', {
reason: selectedReason, reason: selectedReason,
comment: comment comment: comment,
tags: tags
}); });
toast.success($i18n.t('Thanks for your feedback!')); toast.success($i18n.t('Thanks for your feedback!'));
@ -82,7 +91,7 @@
</script> </script>
{#if message?.arena} {#if message?.arena}
<div class="text-xs font-medium translate-y-1.5"> <div class="text-xs font-medium pt-1.5 -mb-0.5">
{$i18n.t('This response was generated by "{{model}}"', { {$i18n.t('This response was generated by "{{model}}"', {
model: selectedModel ? (selectedModel?.name ?? selectedModel.id) : message.selectedModelId model: selectedModel ? (selectedModel?.name ?? selectedModel.id) : message.selectedModelId
})} })}
@ -115,10 +124,10 @@
</div> </div>
{#if reasons.length > 0} {#if reasons.length > 0}
<div class="flex flex-wrap gap-2 text-sm mt-2.5"> <div class="flex flex-wrap gap-1.5 text-sm mt-2.5">
{#each reasons as reason} {#each reasons as reason}
<button <button
class="px-3.5 py-1 border border-gray-50 dark:border-gray-850 hover:bg-gray-100 dark:hover:bg-gray-850 {selectedReason === class="px-3 py-0.5 border border-gray-50 dark:border-gray-850 hover:bg-gray-100 dark:hover:bg-gray-850 {selectedReason ===
reason reason
? 'bg-gray-200 dark:bg-gray-800' ? 'bg-gray-200 dark:bg-gray-800'
: ''} transition rounded-lg" : ''} transition rounded-lg"
@ -126,7 +135,37 @@
selectedReason = reason; selectedReason = reason;
}} }}
> >
{reason} {#if reason === 'accurate_information'}
{$i18n.t('Accurate information')}
{:else if reason === 'followed_instructions_perfectly'}
{$i18n.t('Followed instructions perfectly')}
{:else if reason === 'showcased_creativity'}
{$i18n.t('Showcased creativity')}
{:else if reason === 'positive_attitude'}
{$i18n.t('Positive attitude')}
{:else if reason === 'attention_to_detail'}
{$i18n.t('Attention to detail')}
{:else if reason === 'thorough_explanation'}
{$i18n.t('Thorough explanation')}
{:else if reason === 'dont_like_the_style'}
{$i18n.t("Don't like the style")}
{:else if reason === 'too_verbose'}
{$i18n.t('Too verbose')}
{:else if reason === 'not_helpful'}
{$i18n.t('Not helpful')}
{:else if reason === 'not_factually_correct'}
{$i18n.t('Not factually correct')}
{:else if reason === 'didnt_fully_follow_instructions'}
{$i18n.t("Didn't fully follow instructions")}
{:else if reason === 'refused_when_it_shouldnt_have'}
{$i18n.t("Refused when it shouldn't have")}
{:else if reason === 'being_lazy'}
{$i18n.t('Being lazy')}
{:else if reason === 'other'}
{$i18n.t('Other')}
{:else}
{reason}
{/if}
</button> </button>
{/each} {/each}
</div> </div>
@ -137,22 +176,26 @@
bind:value={comment} bind:value={comment}
class="w-full text-sm px-1 py-2 bg-transparent outline-none resize-none rounded-xl" class="w-full text-sm px-1 py-2 bg-transparent outline-none resize-none rounded-xl"
placeholder={$i18n.t('Feel free to add specific details')} placeholder={$i18n.t('Feel free to add specific details')}
rows="2" rows="3"
/> />
</div> </div>
<div class="mt-2 gap-1.5 flex justify-end"> <div class="mt-2 gap-1.5 flex justify-between">
<!-- {#if $config?.features.enable_community_sharing && selectedModel} <div class="flex items-end group">
<button <Tags
class=" self-center px-3.5 py-2 rounded-xl text-sm font-medium bg-gray-50 hover:bg-gray-100 text-gray-800 dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-white transition" {tags}
type="button" on:delete={(e) => {
on:click={() => { tags = tags.filter(
show = false; (tag) =>
tag.name.replaceAll(' ', '_').toLowerCase() !==
e.detail.replaceAll(' ', '_').toLowerCase()
);
}} }}
> on:add={(e) => {
{$i18n.t('Share to OpenWebUI Community')} tags = [...tags, { name: e.detail }];
</button> }}
{/if} --> />
</div>
<button <button
class=" bg-emerald-700 hover:bg-emerald-800 transition text-white text-sm font-medium rounded-xl px-3.5 py-1.5" class=" bg-emerald-700 hover:bg-emerald-800 transition text-white text-sm font-medium rounded-xl px-3.5 py-1.5"

View File

@ -19,7 +19,8 @@
extractSentencesForAudio, extractSentencesForAudio,
cleanText, cleanText,
getMessageContentParts, getMessageContentParts,
sanitizeResponseContent sanitizeResponseContent,
createMessagesList
} from '$lib/utils'; } from '$lib/utils';
import { WEBUI_BASE_URL } from '$lib/constants'; import { WEBUI_BASE_URL } from '$lib/constants';
@ -42,6 +43,7 @@
import ContentRenderer from './ContentRenderer.svelte'; import ContentRenderer from './ContentRenderer.svelte';
import { createNewFeedback, getFeedbackById, updateFeedbackById } from '$lib/apis/evaluations'; import { createNewFeedback, getFeedbackById, updateFeedbackById } from '$lib/apis/evaluations';
import { getChatById } from '$lib/apis/chats'; import { getChatById } from '$lib/apis/chats';
import { generateTags } from '$lib/apis';
interface MessageType { interface MessageType {
id: string; id: string;
@ -355,6 +357,24 @@
return; return;
} }
if (!annotation) {
const messages = createMessagesList(history, message.id);
const tags = await generateTags(
localStorage.token,
message?.selectedModelId ?? message.model,
messages,
chatId
).catch((error) => {
console.error(error);
return [];
});
console.log(tags);
if (tags) {
updatedMessage.annotation.tags = tags;
}
}
let feedbackItem = { let feedbackItem = {
type: 'rating', type: 'rating',
data: { data: {
@ -1183,6 +1203,7 @@
bind:show={showRateComment} bind:show={showRateComment}
on:save={async (e) => { on:save={async (e) => {
await feedbackHandler(null, { await feedbackHandler(null, {
tags: e.detail.tags,
comment: e.detail.comment, comment: e.detail.comment,
reason: e.detail.reason reason: e.detail.reason
}); });

View File

@ -142,7 +142,7 @@
{#if edit === true} {#if edit === true}
<div class=" w-full bg-gray-50 dark:bg-gray-800 rounded-3xl px-5 py-3 mb-2"> <div class=" w-full bg-gray-50 dark:bg-gray-800 rounded-3xl px-5 py-3 mb-2">
<div class="max-h-[25dvh] overflow-auto"> <div class="max-h-96 overflow-auto">
<textarea <textarea
id="message-edit-{message.id}" id="message-edit-{message.id}"
bind:this={messageEditTextAreaElement} bind:this={messageEditTextAreaElement}

View File

@ -15,6 +15,14 @@
<Modal bind:show size="xs"> <Modal bind:show size="xs">
<div class="px-4 pt-4 pb-5 w-full flex flex-col justify-center"> <div class="px-4 pt-4 pb-5 w-full flex flex-col justify-center">
<Tags {tags} {deleteTag} {addTag} /> <Tags
{tags}
on:delete={(e) => {
deleteTag(e.detail);
}}
on:add={(e) => {
addTag(e.detail);
}}
/>
</div> </div>
</Modal> </Modal>

View File

@ -71,4 +71,12 @@
}); });
</script> </script>
<Tags {tags} {deleteTag} {addTag} /> <Tags
{tags}
on:delete={(e) => {
deleteTag(e.detail);
}}
on:add={(e) => {
addTag(e.detail);
}}
/>

View File

@ -1,28 +1,26 @@
<script lang="ts"> <script lang="ts">
import TagInput from './Tags/TagInput.svelte'; import TagInput from './Tags/TagInput.svelte';
import TagList from './Tags/TagList.svelte'; import TagList from './Tags/TagList.svelte';
import { getContext } from 'svelte'; import { getContext, createEventDispatcher } from 'svelte';
const dispatch = createEventDispatcher();
const i18n = getContext('i18n'); const i18n = getContext('i18n');
export let tags = []; export let tags = [];
export let deleteTag: Function;
export let addTag: Function;
</script> </script>
<div class="flex flex-row flex-wrap gap-1 line-clamp-1"> <div class="flex flex-row flex-wrap gap-1 line-clamp-1">
<TagList <TagList
{tags} {tags}
on:delete={(e) => { on:delete={(e) => {
deleteTag(e.detail); dispatch('delete', e.detail);
}} }}
/> />
<TagInput <TagInput
label={tags.length == 0 ? $i18n.t('Add Tags') : ''} label={tags.length == 0 ? $i18n.t('Add Tags') : ''}
on:add={(e) => { on:add={(e) => {
addTag(e.detail); dispatch('add', e.detail);
}} }}
/> />
</div> </div>

View File

@ -11,12 +11,12 @@
{#each tags as tag} {#each tags as tag}
<Tooltip content={tag.name}> <Tooltip content={tag.name}>
<div <div
class="relative group px-1.5 py-[0.2px] gap-0.5 flex justify-between h-fit max-h-fit w-fit items-center rounded-full bg-gray-500/20 text-gray-700 dark:text-gray-200 transition cursor-pointer" class="relative group/tags px-1.5 py-[0.2px] gap-0.5 flex justify-between h-fit max-h-fit w-fit items-center rounded-full bg-gray-500/20 text-gray-700 dark:text-gray-200 transition cursor-pointer"
> >
<div class=" text-[0.7rem] font-medium self-center line-clamp-1 w-fit"> <div class=" text-[0.7rem] font-medium self-center line-clamp-1 w-fit">
{tag.name} {tag.name}
</div> </div>
<div class="absolute invisible right-0.5 group-hover:visible transition"> <div class="absolute invisible right-0.5 group-hover/tags:visible transition">
<button <button
class="rounded-full border bg-white dark:bg-gray-700 h-full flex self-center cursor-pointer" class="rounded-full border bg-white dark:bg-gray-700 h-full flex self-center cursor-pointer"
on:click={() => { on:click={() => {

View File

@ -671,11 +671,12 @@
<div class="mt-2"> <div class="mt-2">
<Tags <Tags
tags={info?.meta?.tags ?? []} tags={info?.meta?.tags ?? []}
deleteTag={(tagName) => { on:delete={(e) => {
const tagName = e.detail;
info.meta.tags = info.meta.tags.filter((tag) => tag.name !== tagName); info.meta.tags = info.meta.tags.filter((tag) => tag.name !== tagName);
}} }}
addTag={(tagName) => { on:add={(e) => {
console.log(tagName); const tagName = e.detail;
if (!(info?.meta?.tags ?? null)) { if (!(info?.meta?.tags ?? null)) {
info.meta.tags = [{ name: tagName }]; info.meta.tags = [{ name: tagName }];
} else { } else {

View File

@ -618,11 +618,12 @@
<div class="mt-2"> <div class="mt-2">
<Tags <Tags
tags={info?.meta?.tags ?? []} tags={info?.meta?.tags ?? []}
deleteTag={(tagName) => { on:delete={(e) => {
const tagName = e.detail;
info.meta.tags = info.meta.tags.filter((tag) => tag.name !== tagName); info.meta.tags = info.meta.tags.filter((tag) => tag.name !== tagName);
}} }}
addTag={(tagName) => { on:add={(e) => {
console.log(tagName); const tagName = e.detail;
if (!(info?.meta?.tags ?? null)) { if (!(info?.meta?.tags ?? null)) {
info.meta.tags = [{ name: tagName }]; info.meta.tags = [{ name: tagName }];
} else { } else {