ソースを参照

issues #6655 Open ai tts issues (#6696)

tags/0.6.16
chenxu9741 1年前
コミット
6b50bb0fe6
コミッターのメールアドレスに関連付けられたアカウントが存在しません

+ 2
- 1
api/core/model_runtime/model_providers/openai/tts/tts.py ファイルの表示

@@ -114,7 +114,8 @@ class OpenAIText2SpeechModel(_CommonOpenAI, TTSModel):
# doc: https://platform.openai.com/docs/guides/text-to-speech
credentials_kwargs = self._to_credential_kwargs(credentials)
client = OpenAI(**credentials_kwargs)
if not voice or voice not in self.get_tts_model_voices(model=model, credentials=credentials):
model_support_voice = [x.get("value") for x in self.get_tts_model_voices(model=model, credentials=credentials)]
if not voice or voice not in model_support_voice:
voice = self._get_model_default_voice(model, credentials)
word_limit = self._get_model_word_limit(model, credentials)
if len(content_text) > word_limit:

+ 5
- 3
web/app/components/app/configuration/config-voice/param-config-content.tsx ファイルの表示

@@ -31,12 +31,12 @@ const VoiceParamConfig: FC = () => {

let languageItem = languages.find(item => item.value === textToSpeechConfig.language)
const localLanguagePlaceholder = languageItem?.name || t('common.placeholder.select')
if (languages && !languageItem)
if (languages && !languageItem && languages.length > 0)
languageItem = languages[0]
const language = languageItem?.value
const voiceItems = useSWR({ appId, language }, fetchAppVoices).data
let voiceItem = voiceItems?.find(item => item.value === textToSpeechConfig.voice)
if (voiceItems && !voiceItem)
if (voiceItems && !voiceItem && voiceItems.length > 0)
voiceItem = voiceItems[0]

const localVoicePlaceholder = voiceItem?.name || t('common.placeholder.select')
@@ -125,9 +125,11 @@ const VoiceParamConfig: FC = () => {
<div
className='mb-2 leading-[18px] text-[13px] font-semibold text-gray-800'>{t('appDebug.voice.voiceSettings.voice')}</div>
<Listbox
value={voiceItem}
value={voiceItem ?? {}}
disabled={!languageItem}
onChange={(value: Item) => {
if (!value.value)
return
setTextToSpeechConfig({
...textToSpeechConfig,
voice: String(value.value),

+ 1
- 0
web/app/components/app/configuration/features/chat-group/text-to-speech/index.tsx ファイルの表示

@@ -41,6 +41,7 @@ const TextToSpeech: FC = () => {
<AudioBtn
value={languageInfo?.example}
isAudition
voice={textToSpeechConfig.voice}
noCache
/>
)}

+ 6
- 0
web/app/components/app/text-generate/item/index.tsx ファイルの表示

@@ -29,6 +29,7 @@ import { useStore as useAppStore } from '@/app/components/app/store'
import WorkflowProcessItem from '@/app/components/base/chat/chat/answer/workflow-process'
import type { WorkflowProcess } from '@/app/components/base/chat/types'
import type { SiteInfo } from '@/models/share'
import { useChatContext } from '@/app/components/base/chat/chat/context'

const MAX_DEPTH = 3

@@ -127,6 +128,10 @@ const GenerationItem: FC<IGenerationItemProps> = ({
const [childFeedback, setChildFeedback] = useState<Feedbacktype>({
rating: null,
})
const {
config,
} = useChatContext()

const setCurrentLogItem = useAppStore(s => s.setCurrentLogItem)
const setShowPromptLogModal = useAppStore(s => s.setShowPromptLogModal)

@@ -430,6 +435,7 @@ const GenerationItem: FC<IGenerationItemProps> = ({
<AudioBtn
id={messageId!}
className={'mr-1'}
voice={config?.text_to_speech?.voice}
/>
</>
)}

+ 1
- 1
web/app/components/base/audio-btn/audio.player.manager.ts ファイルの表示

@@ -41,7 +41,7 @@ export class AudioPlayerManager {
}

this.msgId = id
this.audioPlayers = new AudioPlayer(url, isPublic, id, msgContent, callback)
this.audioPlayers = new AudioPlayer(url, isPublic, id, msgContent, voice, callback)
return this.audioPlayers
}
}

+ 2
- 3
web/app/components/base/audio-btn/audio.ts ファイルの表示

@@ -23,12 +23,13 @@ export default class AudioPlayer {
isPublic: boolean
callback: ((event: string) => {}) | null

constructor(streamUrl: string, isPublic: boolean, msgId: string | undefined, msgContent: string | null | undefined, callback: ((event: string) => {}) | null) {
constructor(streamUrl: string, isPublic: boolean, msgId: string | undefined, msgContent: string | null | undefined, voice: string | undefined, callback: ((event: string) => {}) | null) {
this.audioContext = new AudioContext()
this.msgId = msgId
this.msgContent = msgContent
this.url = streamUrl
this.isPublic = isPublic
this.voice = voice
this.callback = callback

// Compatible with iphone ios17 ManagedMediaSource
@@ -154,7 +155,6 @@ export default class AudioPlayer {
this.mediaSource?.endOfStream()
clearInterval(endTimer)
}
console.log('finishStream endOfStream endTimer')
}, 10)
}

@@ -169,7 +169,6 @@ export default class AudioPlayer {
const arrayBuffer = this.cacheBuffers.shift()!
this.sourceBuffer?.appendBuffer(arrayBuffer)
}
console.log('finishStream timer')
}, 10)
}


+ 2
- 2
web/app/components/base/audio-btn/index.tsx ファイルの表示

@@ -65,11 +65,11 @@ const AudioBtn = ({
}
const handleToggle = async () => {
if (audioState === 'playing' || audioState === 'loading') {
setAudioState('paused')
setTimeout(() => setAudioState('paused'), 1)
AudioPlayerManager.getInstance().getAudioPlayer(url, isPublic, id, value, voice, audio_finished_call).pauseAudio()
}
else {
setAudioState('loading')
setTimeout(() => setAudioState('loading'), 1)
AudioPlayerManager.getInstance().getAudioPlayer(url, isPublic, id, value, voice, audio_finished_call).playAudio()
}
}

+ 1
- 0
web/app/components/base/chat/chat/answer/operation.tsx ファイルの表示

@@ -125,6 +125,7 @@ const Operation: FC<OperationProps> = ({
id={id}
value={content}
noCache={false}
voice={config?.text_to_speech?.voice}
className='hidden group-hover:block'
/>
</>

+ 1
- 1
web/app/components/base/features/feature-panel/text-to-speech/param-config-content.tsx ファイルの表示

@@ -149,7 +149,7 @@ const VoiceParamConfig = ({
<div
className='mb-2 leading-[18px] text-[13px] font-semibold text-gray-800'>{t('appDebug.voice.voiceSettings.voice')}</div>
<Listbox
value={voiceItem}
value={voiceItem ?? {}}
disabled={!languageItem}
onChange={(value: Item) => {
handleChange({

読み込み中…
キャンセル
保存