refactor: 支持使用浏览器语音播放

This commit is contained in:
CaptainB 2024-09-12 11:03:31 +08:00 committed by 刘瑞斌
parent 24291493d6
commit d551462c05
13 changed files with 45 additions and 110 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.15 on 2024-09-12 11:01
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('application', '0012_application_stt_model_application_stt_model_enable_and_more'),
]
operations = [
migrations.AddField(
model_name='application',
name='tts_type',
field=models.CharField(default='BROWSER', max_length=20, verbose_name='语音播放类型'),
),
]

View File

@ -58,6 +58,7 @@ class Application(AppModelMixin):
stt_model = models.ForeignKey(Model, related_name='stt_model_id', on_delete=models.SET_NULL, db_constraint=False, blank=True, null=True) stt_model = models.ForeignKey(Model, related_name='stt_model_id', on_delete=models.SET_NULL, db_constraint=False, blank=True, null=True)
tts_model_enable = models.BooleanField(verbose_name="语音合成模型是否启用", default=False) tts_model_enable = models.BooleanField(verbose_name="语音合成模型是否启用", default=False)
stt_model_enable = models.BooleanField(verbose_name="语音识别模型是否启用", default=False) stt_model_enable = models.BooleanField(verbose_name="语音识别模型是否启用", default=False)
tts_type = models.CharField(verbose_name="语音播放类型", max_length=20, default="BROWSER")
@staticmethod @staticmethod
def get_default_model_prompt(): def get_default_model_prompt():

View File

@ -694,6 +694,7 @@ class ApplicationSerializer(serializers.Serializer):
'tts_model_id': application.tts_model_id, 'tts_model_id': application.tts_model_id,
'stt_model_enable': application.stt_model_enable, 'stt_model_enable': application.stt_model_enable,
'tts_model_enable': application.tts_model_enable, 'tts_model_enable': application.tts_model_enable,
'tts_type': application.tts_type,
'work_flow': application.work_flow, 'work_flow': application.work_flow,
'show_source': application_access_token.show_source}) 'show_source': application_access_token.show_source})
@ -745,7 +746,7 @@ class ApplicationSerializer(serializers.Serializer):
update_keys = ['name', 'desc', 'model_id', 'multiple_rounds_dialogue', 'prologue', 'status', update_keys = ['name', 'desc', 'model_id', 'multiple_rounds_dialogue', 'prologue', 'status',
'dataset_setting', 'model_setting', 'problem_optimization', 'dialogue_number', 'dataset_setting', 'model_setting', 'problem_optimization', 'dialogue_number',
'stt_model_id', 'tts_model_id', 'tts_model_enable', 'stt_model_enable', 'stt_model_id', 'tts_model_id', 'tts_model_enable', 'stt_model_enable', 'tts_type',
'api_key_is_active', 'icon', 'work_flow', 'model_params_setting'] 'api_key_is_active', 'icon', 'work_flow', 'model_params_setting']
for update_key in update_keys: for update_key in update_keys:
if update_key in instance and instance.get(update_key) is not None: if update_key in instance and instance.get(update_key) is not None:
@ -865,6 +866,8 @@ class ApplicationSerializer(serializers.Serializer):
instance['stt_model_enable'] = node_data['stt_model_enable'] instance['stt_model_enable'] = node_data['stt_model_enable']
if 'tts_model_enable' in node_data: if 'tts_model_enable' in node_data:
instance['tts_model_enable'] = node_data['tts_model_enable'] instance['tts_model_enable'] = node_data['tts_model_enable']
if 'tts_type' in node_data:
instance['tts_type'] = node_data['tts_type']
break break
def speech_to_text(self, file, with_valid=True): def speech_to_text(self, file, with_valid=True):

View File

@ -178,7 +178,7 @@ class Application(APIView):
tags=["应用"], tags=["应用"],
manual_parameters=ApplicationApi.Model.get_request_params_api()) manual_parameters=ApplicationApi.Model.get_request_params_api())
@has_permissions(ViewPermission( @has_permissions(ViewPermission(
[RoleConstants.ADMIN, RoleConstants.USER, RoleConstants.APPLICATION_ACCESS_TOKEN], [RoleConstants.ADMIN, RoleConstants.USER],
[lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE, [lambda r, keywords: Permission(group=Group.APPLICATION, operate=Operate.USE,
dynamic_tag=keywords.get('application_id'))], dynamic_tag=keywords.get('application_id'))],
compare=CompareConstants.AND)) compare=CompareConstants.AND))

View File

@ -1,16 +0,0 @@
# coding=utf-8
from typing import Dict
from common.forms import BaseForm
from setting.models_provider.base_model_provider import BaseModelCredential
class BrowserTextToSpeechCredential(BaseForm, BaseModelCredential):
def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], provider,
raise_exception=False):
return True
def encryption_dict(self, model: Dict[str, object]):
return model

View File

@ -17,10 +17,8 @@ from setting.models_provider.base_model_provider import ModelProvideInfo, ModelT
ModelInfoManage ModelInfoManage
from setting.models_provider.impl.local_model_provider.credential.embedding import LocalEmbeddingCredential from setting.models_provider.impl.local_model_provider.credential.embedding import LocalEmbeddingCredential
from setting.models_provider.impl.local_model_provider.credential.reranker import LocalRerankerCredential from setting.models_provider.impl.local_model_provider.credential.reranker import LocalRerankerCredential
from setting.models_provider.impl.local_model_provider.credential.tts import BrowserTextToSpeechCredential
from setting.models_provider.impl.local_model_provider.model.embedding import LocalEmbedding from setting.models_provider.impl.local_model_provider.model.embedding import LocalEmbedding
from setting.models_provider.impl.local_model_provider.model.reranker import LocalReranker from setting.models_provider.impl.local_model_provider.model.reranker import LocalReranker
from setting.models_provider.impl.local_model_provider.model.tts import BrowserTextToSpeech
from smartdoc.conf import PROJECT_DIR from smartdoc.conf import PROJECT_DIR
embedding_text2vec_base_chinese = ModelInfo('shibing624/text2vec-base-chinese', '', ModelTypeConst.EMBEDDING, embedding_text2vec_base_chinese = ModelInfo('shibing624/text2vec-base-chinese', '', ModelTypeConst.EMBEDDING,
@ -28,14 +26,10 @@ embedding_text2vec_base_chinese = ModelInfo('shibing624/text2vec-base-chinese',
bge_reranker_v2_m3 = ModelInfo('BAAI/bge-reranker-v2-m3', '', ModelTypeConst.RERANKER, bge_reranker_v2_m3 = ModelInfo('BAAI/bge-reranker-v2-m3', '', ModelTypeConst.RERANKER,
LocalRerankerCredential(), LocalReranker) LocalRerankerCredential(), LocalReranker)
browser_tts = ModelInfo('browser_tts', '', ModelTypeConst.TTS, BrowserTextToSpeechCredential(), BrowserTextToSpeech)
model_info_manage = (ModelInfoManage.builder().append_model_info(embedding_text2vec_base_chinese) model_info_manage = (ModelInfoManage.builder().append_model_info(embedding_text2vec_base_chinese)
.append_default_model_info(embedding_text2vec_base_chinese) .append_default_model_info(embedding_text2vec_base_chinese)
.append_model_info(bge_reranker_v2_m3) .append_model_info(bge_reranker_v2_m3)
.append_default_model_info(bge_reranker_v2_m3) .append_default_model_info(bge_reranker_v2_m3)
.append_model_info(browser_tts)
.build()) .build())

View File

@ -1,31 +0,0 @@
from typing import Dict
from setting.models_provider.base_model_provider import MaxKBBaseModel
from setting.models_provider.impl.base_tts import BaseTextToSpeech
class BrowserTextToSpeech(MaxKBBaseModel, BaseTextToSpeech):
model: str
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.model = kwargs.get('model')
@staticmethod
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
optional_params = {}
if 'max_tokens' in model_kwargs and model_kwargs['max_tokens'] is not None:
optional_params['max_tokens'] = model_kwargs['max_tokens']
if 'temperature' in model_kwargs and model_kwargs['temperature'] is not None:
optional_params['temperature'] = model_kwargs['temperature']
return BrowserTextToSpeech(
model=model_name,
**optional_params,
)
def check_auth(self):
pass
def text_to_speech(self, text):
pass

View File

@ -18,6 +18,7 @@ interface ApplicationFormType {
tts_model_id?: string tts_model_id?: string
stt_model_enable?: boolean stt_model_enable?: boolean
tts_model_enable?: boolean tts_model_enable?: boolean
tts_type?: string
} }
interface chatType { interface chatType {
id: string id: string

View File

@ -239,13 +239,7 @@ const props = defineProps({
chatId: { chatId: {
type: String, type: String,
default: '' default: ''
}, // Id } // Id
ttsModelOptions: {
type: Object,
default: () => {
return {}
}
}
}) })
const emit = defineEmits(['refresh', 'scroll']) const emit = defineEmits(['refresh', 'scroll'])
@ -771,20 +765,14 @@ const uploadRecording = async (audioBlob: Blob) => {
} }
const playAnswerText = (text: string) => { const playAnswerText = (text: string) => {
if ( if (props.data.tts_type === 'BROWSER') {
props.ttsModelOptions?.model_local_provider?.filter(
(v: any) => v.id === props.data.tts_model_id
).length > 0
) {
// SpeechSynthesisUtterance // SpeechSynthesisUtterance
const utterance = new SpeechSynthesisUtterance(text) const utterance = new SpeechSynthesisUtterance(text)
// //
window.speechSynthesis.speak(utterance) window.speechSynthesis.speak(utterance)
return
} }
if (props.data.tts_type === 'TTS') {
applicationApi applicationApi.postTextToSpeech(props.data.id as string, { 'text': text }, loading)
.postTextToSpeech(props.data.id as string, { text: text }, loading)
.then((res: any) => { .then((res: any) => {
// MP3 // MP3
// Blob // Blob
@ -810,6 +798,7 @@ const playAnswerText = (text: string) => {
.catch((err) => { .catch((err) => {
console.log('err: ', err) console.log('err: ', err)
}) })
}
} }
onMounted(() => { onMounted(() => {

View File

@ -138,7 +138,7 @@
</div> </div>
</div> </div>
<div class="scrollbar-height"> <div class="scrollbar-height">
<AiChat :data="detail" :tts-model-options="ttsModelOptions"></AiChat> <AiChat :data="detail"></AiChat>
</div> </div>
</div> </div>
</el-collapse-transition> </el-collapse-transition>
@ -157,7 +157,6 @@ import { datetimeFormat } from '@/utils/time'
import useStore from '@/stores' import useStore from '@/stores'
import { WorkFlowInstance } from '@/workflow/common/validate' import { WorkFlowInstance } from '@/workflow/common/validate'
import { hasPermission } from '@/utils/permission' import { hasPermission } from '@/utils/permission'
import { groupBy } from 'lodash'
const { user, application } = useStore() const { user, application } = useStore()
const router = useRouter() const router = useRouter()
@ -182,7 +181,6 @@ const enlarge = ref(false)
const saveTime = ref<any>('') const saveTime = ref<any>('')
const activeName = ref('base') const activeName = ref('base')
const functionLibList = ref<any[]>([]) const functionLibList = ref<any[]>([])
const ttsModelOptions = ref<any>(null)
function publicHandle() { function publicHandle() {
workflowRef.value workflowRef.value
@ -290,6 +288,7 @@ function getDetail() {
detail.value = res.data detail.value = res.data
detail.value.stt_model_id = res.data.stt_model detail.value.stt_model_id = res.data.stt_model
detail.value.tts_model_id = res.data.tts_model detail.value.tts_model_id = res.data.tts_model
detail.value.tts_type = res.data.tts_type
saveTime.value = res.data?.update_time saveTime.value = res.data?.update_time
}) })
} }
@ -312,20 +311,6 @@ function getList() {
}) })
} }
function getTTSModel() {
loading.value = true
applicationApi
.getApplicationTTSModel(id)
.then((res: any) => {
ttsModelOptions.value = groupBy(res?.data, 'provider')
loading.value = false
})
.catch(() => {
loading.value = false
})
}
/** /**
* 定时保存 * 定时保存
*/ */
@ -345,7 +330,6 @@ const closeInterval = () => {
} }
onMounted(() => { onMounted(() => {
getTTSModel()
getDetail() getDetail()
getList() getList()
// //

View File

@ -369,7 +369,12 @@
<el-switch v-model="applicationForm.tts_model_enable"/> <el-switch v-model="applicationForm.tts_model_enable"/>
</div> </div>
</template> </template>
<el-radio-group v-model="applicationForm.tts_type">
<el-radio label="浏览器播放(免费)" value="BROWSER"/>
<el-radio label="TTS模型" value="TTS"/>
</el-radio-group>
<el-select <el-select
v-if="applicationForm.tts_type === 'TTS'"
v-model="applicationForm.tts_model_id" v-model="applicationForm.tts_model_id"
class="w-full" class="w-full"
popper-class="select-model" popper-class="select-model"
@ -464,7 +469,7 @@
</h4> </h4>
</div> </div>
<div class="scrollbar-height"> <div class="scrollbar-height">
<AiChat :data="applicationForm" :tts-model-options="ttsModelOptions"></AiChat> <AiChat :data="applicationForm"></AiChat>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -556,6 +561,7 @@ const applicationForm = ref<ApplicationFormType>({
tts_model_id: '', tts_model_id: '',
stt_model_enable: false, stt_model_enable: false,
tts_model_enable: false, tts_model_enable: false,
tts_type: 'BROWSER',
type: 'SIMPLE' type: 'SIMPLE'
}) })
@ -657,6 +663,7 @@ function getDetail() {
applicationForm.value.model_id = res.data.model applicationForm.value.model_id = res.data.model
applicationForm.value.stt_model_id = res.data.stt_model applicationForm.value.stt_model_id = res.data.stt_model
applicationForm.value.tts_model_id = res.data.tts_model applicationForm.value.tts_model_id = res.data.tts_model
applicationForm.value.tts_type = res.data.tts_type
}) })
} }

View File

@ -108,7 +108,6 @@
:appId="applicationDetail?.id" :appId="applicationDetail?.id"
:record="currentRecordList" :record="currentRecordList"
:chatId="currentChatId" :chatId="currentChatId"
:tts-model-options="ttsModelOptions"
@refresh="refresh" @refresh="refresh"
@scroll="handleScroll" @scroll="handleScroll"
> >
@ -131,8 +130,6 @@ import { marked } from 'marked'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
import { isAppIcon } from '@/utils/application' import { isAppIcon } from '@/utils/application'
import useStore from '@/stores' import useStore from '@/stores'
import applicationApi from '@/api/application'
import { groupBy } from 'lodash'
import useResize from '@/layout/hooks/useResize' import useResize from '@/layout/hooks/useResize'
useResize() useResize()
@ -170,8 +167,6 @@ const left_loading = ref(false)
const applicationDetail = ref<any>({}) const applicationDetail = ref<any>({})
const applicationAvailable = ref<boolean>(true) const applicationAvailable = ref<boolean>(true)
const chatLogeData = ref<any[]>([]) const chatLogeData = ref<any[]>([])
const ttsModelOptions = ref<any>(null)
const paginationConfig = ref({ const paginationConfig = ref({
current_page: 1, current_page: 1,
@ -233,7 +228,6 @@ function getAppProfile() {
if (res.data?.show_history || !user.isEnterprise()) { if (res.data?.show_history || !user.isEnterprise()) {
getChatLog(applicationDetail.value.id) getChatLog(applicationDetail.value.id)
} }
getTTSModel()
}) })
.catch(() => { .catch(() => {
applicationAvailable.value = false applicationAvailable.value = false
@ -342,20 +336,6 @@ async function exportHTML(): Promise<void> {
saveAs(blob, suggestedName) saveAs(blob, suggestedName)
} }
function getTTSModel() {
loading.value = true
applicationApi
.getApplicationTTSModel(applicationDetail.value.id)
.then((res: any) => {
ttsModelOptions.value = groupBy(res?.data, 'provider')
loading.value = false
})
.catch(() => {
loading.value = false
})
}
onMounted(() => { onMounted(() => {
user.changeUserType(2) user.changeUserType(2)
getAccessToken(accessToken) getAccessToken(accessToken)

View File

@ -135,7 +135,12 @@
<el-switch v-model="form_data.tts_model_enable" /> <el-switch v-model="form_data.tts_model_enable" />
</div> </div>
</template> </template>
<el-radio-group v-model="form_data.tts_type">
<el-radio label="浏览器播放(免费)" value="BROWSER"/>
<el-radio label="TTS模型" value="TTS"/>
</el-radio-group>
<el-select <el-select
v-if="form_data.tts_type === 'TTS'"
v-model="form_data.tts_model_id" v-model="form_data.tts_model_id"
class="w-full" class="w-full"
popper-class="select-model" popper-class="select-model"