ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-14 13:25:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' of https://github.com/ai-friend-coming/open-webui-next

Browse source
This commit is contained in:
xinyan 2025-11-30 22:19:46 +08:00
commit 24813ee56e
1 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
src/lib/components/chat/Messages/ResponseMessage.svelte
View file

@ -15,15 +15,15 @@
import { getChatById } from '$lib/apis/chats'; import { getChatById } from '$lib/apis/chats';
import { generateTags } from '$lib/apis'; import { generateTags } from '$lib/apis';
import { import {
config, config,
models, models,
settings, settings,
temporaryChatEnabled, temporaryChatEnabled,
TTSWorker, TTSWorker,
user, user,
userModels userModels
} from '$lib/stores'; } from '$lib/stores';
import { synthesizeOpenAISpeech } from '$lib/apis/audio'; import { synthesizeOpenAISpeech } from '$lib/apis/audio';
import { imageGenerations } from '$lib/apis/images'; import { imageGenerations } from '$lib/apis/images';
import { import {
@ -155,30 +155,27 @@ import {
let buttonsContainerElement: HTMLDivElement; let buttonsContainerElement: HTMLDivElement;
let showDeleteConfirm = false; let showDeleteConfirm = false;
let model = null; let model = null;
let userModel = null; let userModel = null;
let modelName = ''; let modelName = '';
$: { $: {
const platformModel = $models.find((m) => m.id === message.model); const platformModel = $models.find((m) => m.id === message.model);
const credentialModel = (() => { const credentialModel = (() => {
// 优先使用随消息携带的 credential_id 精确匹配 // 优先使用随消息携带的 credential_id 精确匹配
if (message?.model_item?.credential_id) { if (message?.model_item?.credential_id) {
return $userModels.find((m) => m.id === message.model_item.credential_id); return $userModels.find((m) => m.id === message.model_item.credential_id);
} }
// 兼容历史消息：通过 model_id 反查 // 兼容历史消息：通过 model_id 反查
return $userModels.find((m) => m.model_id === message.model); return $userModels.find((m) => m.model_id === message.model);
})(); })();
userModel = credentialModel ? { ...credentialModel, id: credentialModel.model_id } : null; userModel = credentialModel ? { ...credentialModel, id: credentialModel.model_id } : null;
model = platformModel ?? userModel; model = platformModel ?? userModel;
modelName = modelName =
message.modelName ?? message.modelName ?? model?.name ?? userModel?.name ?? userModel?.model_id ?? message.model;
model?.name ?? }
(userModel?.name ?? userModel?.model_id) ??
message.model;
}
let edit = false; let edit = false;
let editedContent = ''; let editedContent = '';
@ -649,10 +646,10 @@ $: {
<div class="flex-auto w-0 pl-1 relative"> <div class="flex-auto w-0 pl-1 relative">
<Name> <Name>
<Tooltip content={modelName} placement="top-start"> <Tooltip content={modelName} placement="top-start">
<span class="line-clamp-1 text-black dark:text-white"> <span class="line-clamp-1 text-black dark:text-white">
{modelName} {modelName}
</span> </span>
</Tooltip> </Tooltip>
{#if message.timestamp} {#if message.timestamp}
@ -1015,7 +1012,8 @@ $: {
</button> </button>
</Tooltip> </Tooltip>
{#if $user?.role === 'admin' || ($user?.permissions?.chat?.tts ?? true)} <!-- 朗读按钮 -->
<!-- {#if $user?.role === 'admin' || ($user?.permissions?.chat?.tts ?? true)}
<Tooltip content={$i18n.t('Read Aloud')} placement="bottom"> <Tooltip content={$i18n.t('Read Aloud')} placement="bottom">
<button <button
aria-label={$i18n.t('Read Aloud')} aria-label={$i18n.t('Read Aloud')}
@ -1097,7 +1095,7 @@ $: {
{/if} {/if}
</button> </button>
</Tooltip> </Tooltip>
{/if} {/if} -->
{#if $config?.features.enable_image_generation && ($user?.role === 'admin' || $user?.permissions?.features?.image_generation) && !readOnly} {#if $config?.features.enable_image_generation && ($user?.role === 'admin' || $user?.permissions?.features?.image_generation) && !readOnly}
<Tooltip content={$i18n.t('Generate Image')} placement="bottom"> <Tooltip content={$i18n.t('Generate Image')} placement="bottom">
@ -1211,7 +1209,8 @@ $: {
{/if} {/if}
{#if !readOnly} {#if !readOnly}
{#if !$temporaryChatEnabled && ($config?.features.enable_message_rating ?? true) && ($user?.role === 'admin' || ($user?.permissions?.chat?.rate_response ?? true))} <!-- 点赞和踩 -->
<!-- {#if !$temporaryChatEnabled && ($config?.features.enable_message_rating ?? true) && ($user?.role === 'admin' || ($user?.permissions?.chat?.rate_response ?? true))}
<Tooltip content={$i18n.t('Good Response')} placement="bottom"> <Tooltip content={$i18n.t('Good Response')} placement="bottom">
<button <button
aria-label={$i18n.t('Good Response')} aria-label={$i18n.t('Good Response')}
@ -1287,9 +1286,10 @@ $: {
</svg> </svg>
</button> </button>
</Tooltip> </Tooltip>
{/if} {/if} -->
{#if isLastMessage && ($user?.role === 'admin' || ($user?.permissions?.chat?.continue_response ?? true))} <!-- 继续生成按钮 -->
<!-- {#if isLastMessage && ($user?.role === 'admin' || ($user?.permissions?.chat?.continue_response ?? true))}
<Tooltip content={$i18n.t('Continue Response')} placement="bottom"> <Tooltip content={$i18n.t('Continue Response')} placement="bottom">
<button <button
aria-label={$i18n.t('Continue Response')} aria-label={$i18n.t('Continue Response')}
@ -1324,7 +1324,7 @@ $: {
</svg> </svg>
</button> </button>
</Tooltip> </Tooltip>
{/if} {/if} -->
{#if $user?.role === 'admin' || ($user?.permissions?.chat?.regenerate_response ?? true)} {#if $user?.role === 'admin' || ($user?.permissions?.chat?.regenerate_response ?? true)}
{#if $settings?.regenerateMenu ?? true} {#if $settings?.regenerateMenu ?? true}
@ -1518,25 +1518,25 @@ $: {
}} }}
/> />
{/if} {/if}
<!-- AI friend 屏蔽提问提示 --> <!-- AI friend 屏蔽提问提示 -->
{#if false} {#if false}
{#if (isLastMessage || ($settings?.keepFollowUpPrompts ?? false)) && message.done && !readOnly && (message?.followUps ?? []).length > 0} {#if (isLastMessage || ($settings?.keepFollowUpPrompts ?? false)) && message.done && !readOnly && (message?.followUps ?? []).length > 0}
<div class="mt-2.5" in:fade={{ duration: 100 }}> <div class="mt-2.5" in:fade={{ duration: 100 }}>
<FollowUps <FollowUps
followUps={message?.followUps} followUps={message?.followUps}
onClick={(prompt) => { onClick={(prompt) => {
if ($settings?.insertFollowUpPrompt ?? false) { if ($settings?.insertFollowUpPrompt ?? false) {
// Insert the follow-up prompt into the input box // Insert the follow-up prompt into the input box
setInputText(prompt); setInputText(prompt);
} else { } else {
// Submit the follow-up prompt directly // Submit the follow-up prompt directly
submitMessage(message?.id, prompt); submitMessage(message?.id, prompt);
} }
}} }}
/> />
</div> </div>
{/if} {/if}
{/if} {/if}
{/if} {/if}
</div> </div>