Skip to content

Commit 20cf018

Browse files
committed
fix: Models rerank stt
1 parent e28c858 commit 20cf018

File tree

8 files changed

+51
-51
lines changed

8 files changed

+51
-51
lines changed

apps/models_provider/impl/aliyun_bai_lian_model_provider/credential/asr_stt.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
from models_provider.base_model_provider import BaseModelCredential, ValidCode
99
from django.utils.translation import gettext as _
1010

11-
from models_provider.impl.aliyun_bai_lian_model_provider.credential.omni_stt import AliyunBaiLianOmiSTTModelParams
12-
1311

1412
class AliyunBaiLianAsrSTTModelCredential(BaseForm, BaseModelCredential):
1513
api_url = forms.TextInputField(_('API URL'), required=True)
@@ -64,4 +62,4 @@ def encryption_dict(self, model: Dict[str, object]) -> Dict[str, object]:
6462

6563
def get_model_params_setting_form(self, model_name):
6664

67-
return AliyunBaiLianOmiSTTModelParams()
65+
pass

apps/models_provider/impl/aliyun_bai_lian_model_provider/credential/omni_stt.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
from models_provider.base_model_provider import BaseModelCredential, ValidCode
99
from django.utils.translation import gettext as _
1010

11-
class AliyunBaiLianOmiSTTModelParams(BaseForm):
12-
CueWord = forms.TextInputField(
13-
TooltipLabel(_('CueWord'), _('If not passed, the default value is What is this audio saying? Only answer the audio content')),
14-
required=True,
15-
default_value='这段音频在说什么,只回答音频的内容',
16-
)
11+
# class AliyunBaiLianOmiSTTModelParams(BaseForm):
12+
# CueWord = forms.TextInputField(
13+
# TooltipLabel(_('CueWord'), _('If not passed, the default value is What is this audio saying? Only answer the audio content')),
14+
# required=True,
15+
# default_value='这段音频在说什么,只回答音频的内容',
16+
# )
1717

1818

1919
class AliyunBaiLianOmiSTTModelCredential(BaseForm, BaseModelCredential):
@@ -70,4 +70,4 @@ def encryption_dict(self, model: Dict[str, object]) -> Dict[str, object]:
7070

7171
def get_model_params_setting_form(self, model_name):
7272

73-
return AliyunBaiLianOmiSTTModelParams()
73+
pass

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/asr_stt.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ def speech_to_text(self, audio_file):
6161
messages=messages,
6262
result_format="message",
6363
)
64-
65-
text = response["output"]["choices"][0]["message"].content[0]["text"]
66-
67-
return text
64+
if response.status_code == 200:
65+
text = response["output"]["choices"][0]["message"].content[0]["text"]
66+
return text
67+
else:
68+
raise Exception('Error: ', response.message)
6869

6970
except Exception as err:
7071
maxkb_logger.error(f":Error: {str(err)}: {traceback.format_exc()}")

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/omni_stt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def speech_to_text(self, audio_file):
6868
"format": "mp3",
6969
},
7070
},
71-
{"type": "text", "text": self.params.get('CueWord')},
71+
{"type": "text", "text": '这段音频在说什么,只回答音频的内容'},
7272
],
7373
},
7474
],

apps/models_provider/impl/tencent_model_provider/credential/stt.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,38 @@
88
from models_provider.base_model_provider import BaseModelCredential, ValidCode
99

1010

11-
class TencentSSTModelParams(BaseForm):
12-
EngSerViceType = forms.SingleSelect(
13-
TooltipLabel(_('Engine model type'), _('If not passed, the default value is 16k_zh (Chinese universal)')),
14-
required=True,
15-
default_value='16k_zh',
16-
option_list=[
17-
{"value": "8k_zh", "label": _("Chinese telephone universal")},
18-
{"value": "8k_en", "label": _("English telephone universal")},
19-
{"value": "16k_zh", "label": _("Commonly used in Chinese")},
20-
{"value": "16k_zh-PY", "label": _("Chinese, English, and Guangdong")},
21-
{"value": "16k_zh_medical", "label": _("Chinese medical")},
22-
{"value": "16k_en", "label": _("English")},
23-
{"value": "16k_yue", "label": _("Cantonese")},
24-
{"value": "16k_ja", "label": _("Japanese")},
25-
{"value": "16k_ko", "label": _("Korean")},
26-
{"value": "16k_vi", "label": _("Vietnamese")},
27-
{"value": "16k_ms", "label": _("Malay language")},
28-
{"value": "16k_id", "label": _("Indonesian language")},
29-
{"value": "16k_fil", "label": _("Filipino language")},
30-
{"value": "16k_th", "label": _("Thai")},
31-
{"value": "16k_pt", "label": _("Portuguese")},
32-
{"value": "16k_tr", "label": _("Turkish")},
33-
{"value": "16k_ar", "label": _("Arabic")},
34-
{"value": "16k_es", "label": _("Spanish")},
35-
{"value": "16k_hi", "label": _("Hindi")},
36-
{"value": "16k_fr", "label": _("French")},
37-
{"value": "16k_de", "label": _("German")},
38-
{"value": "16k_zh_dialect", "label": _("Multiple dialects, supporting 23 dialects")}
39-
],
40-
value_field='value',
41-
text_field='label'
42-
)
11+
# class TencentSSTModelParams(BaseForm):
12+
# EngSerViceType = forms.SingleSelect(
13+
# TooltipLabel(_('Engine model type'), _('If not passed, the default value is 16k_zh (Chinese universal)')),
14+
# required=True,
15+
# default_value='16k_zh',
16+
# option_list=[
17+
# {"value": "8k_zh", "label": _("Chinese telephone universal")},
18+
# {"value": "8k_en", "label": _("English telephone universal")},
19+
# {"value": "16k_zh", "label": _("Commonly used in Chinese")},
20+
# {"value": "16k_zh-PY", "label": _("Chinese, English, and Guangdong")},
21+
# {"value": "16k_zh_medical", "label": _("Chinese medical")},
22+
# {"value": "16k_en", "label": _("English")},
23+
# {"value": "16k_yue", "label": _("Cantonese")},
24+
# {"value": "16k_ja", "label": _("Japanese")},
25+
# {"value": "16k_ko", "label": _("Korean")},
26+
# {"value": "16k_vi", "label": _("Vietnamese")},
27+
# {"value": "16k_ms", "label": _("Malay language")},
28+
# {"value": "16k_id", "label": _("Indonesian language")},
29+
# {"value": "16k_fil", "label": _("Filipino language")},
30+
# {"value": "16k_th", "label": _("Thai")},
31+
# {"value": "16k_pt", "label": _("Portuguese")},
32+
# {"value": "16k_tr", "label": _("Turkish")},
33+
# {"value": "16k_ar", "label": _("Arabic")},
34+
# {"value": "16k_es", "label": _("Spanish")},
35+
# {"value": "16k_hi", "label": _("Hindi")},
36+
# {"value": "16k_fr", "label": _("French")},
37+
# {"value": "16k_de", "label": _("German")},
38+
# {"value": "16k_zh_dialect", "label": _("Multiple dialects, supporting 23 dialects")}
39+
# ],
40+
# value_field='value',
41+
# text_field='label'
42+
# )
4343

4444
class TencentSTTModelCredential(BaseForm, BaseModelCredential):
4545
REQUIRED_FIELDS = ["SecretId", "SecretKey"]
@@ -87,4 +87,4 @@ def encryption_dict(self, model):
8787
SecretKey = forms.PasswordInputField('SecretKey', required=True)
8888

8989
def get_model_params_setting_form(self, model_name):
90-
return TencentSSTModelParams()
90+
pass

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def speech_to_text(self, audio_file):
6565
# 实例化一个请求对象,每个接口都会对应一个request对象
6666
req = models.SentenceRecognitionRequest()
6767
params = {
68-
"EngSerViceType": self.params.get('EngSerViceType'),
68+
"EngSerViceType": '16k_zh',
6969
"SourceType": 1,
7070
"VoiceFormat": "mp3",
7171
"Data": _v.decode(),

apps/models_provider/impl/vllm_model_provider/credential/reranker.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
3131
return False
3232
try:
3333
model: VllmBgeReranker = provider.get_model(model_type, model_name, model_credential)
34-
model.compress_documents([Document(page_content=_('Hello'))], _('Hello'))
34+
test_text = str(_('Hello'))
35+
model.compress_documents([Document(page_content=test_text)], test_text)
3536
except Exception as e:
3637
traceback.print_exc()
3738
if isinstance(e, AppApiException):

apps/models_provider/impl/vllm_model_provider/vllm_model_provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
]
5555

5656
reranker_model_info_list = [
57-
ModelInfo('bge-reranker-v2-m3', '', ModelTypeConst.RERANKER, rerank_model_credential, VllmBgeReranker),
57+
ModelInfo('BAAI/bge-reranker-v2-m3', '', ModelTypeConst.RERANKER, rerank_model_credential, VllmBgeReranker),
5858
]
5959

6060
model_info_manage = (

0 commit comments

Comments
 (0)