Skip to content

Commit 57468d7

Browse files
committed
fix: add model_name to credentials and update business_params defaults
1 parent 184bf7b commit 57468d7

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

  • apps/models_provider/impl/xf_model_provider/model

apps/models_provider/impl/xf_model_provider/model/stt.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class XFSparkSpeechToText(MaxKBBaseModel, BaseSpeechToText):
3535
spark_api_secret: str
3636
spark_api_url: str
3737
params: dict
38+
model_name: str
3839

3940
def __init__(self, **kwargs):
4041
super().__init__(**kwargs)
@@ -43,6 +44,7 @@ def __init__(self, **kwargs):
4344
self.spark_api_key = kwargs.get('spark_api_key')
4445
self.spark_api_secret = kwargs.get('spark_api_secret')
4546
self.params = kwargs.get('params')
47+
self.model_name = kwargs.get('model_name')
4648

4749
@staticmethod
4850
def is_cache_model():
@@ -61,6 +63,7 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
6163
spark_api_secret=model_credential.get('spark_api_secret'),
6264
spark_api_url=model_credential.get('spark_api_url'),
6365
params=model_kwargs,
66+
model_name=model_name,
6467
**optional_params
6568
)
6669

@@ -135,11 +138,18 @@ async def send(self, ws, file):
135138
frameSize = 8000 # 每一帧的音频大小
136139
status = STATUS_FIRST_FRAME # 音频的状态信息,标识音频是第一帧,还是中间帧、最后一帧
137140

138-
allowed_params = {'language','domain','accent','vad_eos','dwa','pd','ptt',
139-
'pcm','ltc','rlang','vinfo','nunum','speex_size','nbest','wbest'}
140-
141-
business_params = {k: v for k,v in self.params.items() if k in allowed_params}
142-
141+
allowed_params = {'language', 'domain', 'accent', 'vad_eos', 'dwa', 'pd', 'ptt',
142+
'pcm', 'ltc', 'rlang', 'vinfo', 'nunum', 'speex_size', 'nbest', 'wbest'}
143+
144+
business_params = {k: v for k, v in self.params.items() if k in allowed_params}
145+
if not business_params:
146+
business_params = {
147+
"domain": f'{self.model_name}',
148+
"language": "zh_cn",
149+
"accent": "mandarin",
150+
"vinfo": 1,
151+
"vad_eos": 10000
152+
}
143153
while True:
144154
buf = file.read(frameSize)
145155
# 文件结束

0 commit comments

Comments
 (0)