Skip to content

Commit a0c5384

Browse files
wxg0103wxg0103
committed
fix: refactor model info list and improve code formatting in aliyun_bai_lian_model_provider.py
1 parent 35129e8 commit a0c5384

13 files changed

Lines changed: 263 additions & 162 deletions

File tree

‎apps/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py‎

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

‎apps/models_provider/impl/deepseek_model_provider/deepseek_model_provider.py‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,57 @@
11
#!/usr/bin/env python
22
# -*- coding: UTF-8 -*-
33
"""
4-
@Project ：MaxKB
4+
@Project ：MaxKB
55
@File ：deepseek_model_provider.py
66
@Author ：Brian Yang
7-
@Date ：5/12/24 7:40 AM
7+
@Date ：5/12/24 7:40 AM
88
"""
9+
910
import os
1011

1112
from common.utils.common import get_file_content
12-
from models_provider.base_model_provider import IModelProvider, ModelProvideInfo, ModelInfo, ModelTypeConst, \
13-
ModelInfoManage
13+
from models_provider.base_model_provider import (
14+
IModelProvider,
15+
ModelProvideInfo,
16+
ModelInfo,
17+
ModelTypeConst,
18+
ModelInfoManage,
19+
)
1420
from models_provider.impl.deepseek_model_provider.credential.llm import DeepSeekLLMModelCredential
1521
from models_provider.impl.deepseek_model_provider.model.llm import DeepSeekChatModel
1622
from maxkb.conf import PROJECT_DIR
17-
from django.utils.translation import gettext as _
1823

1924
deepseek_llm_model_credential = DeepSeekLLMModelCredential()
20-
deepseek_reasoner = ModelInfo('deepseek-reasoner', '', ModelTypeConst.LLM,
21-
deepseek_llm_model_credential, DeepSeekChatModel
22-
)
23-
24-
deepseek_chat = ModelInfo('deepseek-chat', _('Good at common conversational tasks, supports 32K contexts'),
25-
ModelTypeConst.LLM,
26-
deepseek_llm_model_credential, DeepSeekChatModel
27-
)
25+
deepseek_llm_list = [
26+
ModelInfo("deepseek-v4-pro", "", ModelTypeConst.LLM, deepseek_llm_model_credential, DeepSeekChatModel),
27+
ModelInfo("deepseek-v4-flash", "", ModelTypeConst.LLM, deepseek_llm_model_credential, DeepSeekChatModel),
28+
]
2829

29-
deepseek_coder = ModelInfo('deepseek-coder', _('Good at handling programming tasks, supports 16K contexts'),
30-
ModelTypeConst.LLM,
31-
deepseek_llm_model_credential,
32-
DeepSeekChatModel)
33-
34-
model_info_manage = ModelInfoManage.builder().append_model_info(deepseek_reasoner).append_model_info(deepseek_chat).append_model_info(
35-
deepseek_coder).append_default_model_info(
36-
deepseek_coder).build()
30+
model_info_manage = (
31+
ModelInfoManage.builder()
32+
.append_model_info_list(deepseek_llm_list)
33+
.append_default_model_info(deepseek_llm_list[0])
34+
.build()
35+
)
3736

3837

3938
class DeepSeekModelProvider(IModelProvider):
40-
4139
def get_model_info_manage(self):
4240
return model_info_manage
4341

4442
def get_model_provide_info(self):
45-
return ModelProvideInfo(provider='model_deepseek_provider', name='DeepSeek', icon=get_file_content(
46-
os.path.join(PROJECT_DIR, "apps", 'models_provider', 'impl', 'deepseek_model_provider', 'icon',
47-
'deepseek_icon_svg')))
43+
return ModelProvideInfo(
44+
provider="model_deepseek_provider",
45+
name="DeepSeek",
46+
icon=get_file_content(
47+
os.path.join(
48+
PROJECT_DIR,
49+
"apps",
50+
"models_provider",
51+
"impl",
52+
"deepseek_model_provider",
53+
"icon",
54+
"deepseek_icon_svg",
55+
)
56+
),
57+
)

‎apps/models_provider/impl/minimax_model_provider/minimax_model_provider.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@
3636
MiniMaxChatModel,
3737
)
3838

39+
minimax_m3 = ModelInfo(
40+
"MiniMax-M3",
41+
_(""),
42+
ModelTypeConst.LLM,
43+
minimax_llm_model_credential,
44+
MiniMaxChatModel,
45+
)
3946
minimax_m2_7_highspeed = ModelInfo(
4047
"MiniMax-M2.7-highspeed",
4148
_("High-speed version of M2.7 for low-latency scenarios. 204K context window"),
@@ -88,6 +95,7 @@
8895
]
8996
model_info_manage = (
9097
ModelInfoManage.builder()
98+
.append_model_info(minimax_m3)
9199
.append_model_info(minimax_m2_7)
92100
.append_model_info(minimax_m2_7_highspeed)
93101
.append_model_info(minimax_m2_5)

‎ui/src/components/ai-chat/component/operation-button/ChatOperationButton.vue‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,13 @@
136136
</el-button>
137137
</el-tooltip>
138138
</span>
139-
<span class="ml-8">
139+
<span class="ml-8" v-if="props.application.show_share">
140140
<el-tooltip effect="dark" :content="$t('aiChat.share')" placement="top">
141-
<el-button text @click.stop="clickShareHandle(props.data.record_id)" :disabled="chat_loading">
141+
<el-button
142+
text
143+
@click.stop="clickShareHandle(props.data.record_id)"
144+
:disabled="chat_loading"
145+
>
142146
<AppIcon class="color-secondary" iconName="app-share"></AppIcon>
143147
</el-button>
144148
</el-tooltip>
@@ -182,6 +186,7 @@ const props = withDefaults(
182186
tts: boolean
183187
tts_type: string
184188
tts_autoplay: boolean
189+
application: any
185190
}>(),
186191
{
187192
data: () => ({}),

‎ui/src/components/ai-chat/component/operation-button/index.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
:applicationId="application.id"
3636
:chatId="chatRecord.chat_id"
3737
:chat_loading="loading"
38+
:application="application"
3839
@regeneration="regenerationChart(chatRecord)"
3940
/>
4041
</div>

‎ui/src/locales/lang/en-US/views/application-overview.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export default {
7474
draggablePosition: 'Draggable Position',
7575
showHistory: 'Show Chat History',
7676
displayGuide: 'Show Guide Image (Floating Mode)',
77+
share: 'Allow sharing of chat records',
7778
disclaimer: 'Disclaimer',
7879
disclaimerValue: 'This content is AI-generated and for reference only.',
7980
chatBackground: 'Chat Background',

‎ui/src/locales/lang/zh-CN/views/application-overview.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export default {
7272
draggablePosition: '可拖拽位置',
7373
showHistory: '显示历史记录',
7474
displayGuide: '显示引导图(浮窗模式)',
75+
share: '允许分享对话记录',
7576
disclaimer: '免责声明',
7677
disclaimerValue: '「以上内容均由 AI 生成，仅供参考和借鉴」',
7778
chatBackground: '聊天背景',

‎ui/src/locales/lang/zh-Hant/views/application-overview.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export default {
7272
draggablePosition: '可拖曳位置',
7373
showHistory: '顯示歷史紀錄',
7474
displayGuide: '顯示引導圖(浮窗模式)',
75+
share: '允许分享对话记录',
7576
disclaimer: '免責聲明',
7677
disclaimerValue: '「以上內容均由 AI 生成，僅供參考和借鏡」',
7778
chatBackground: '聊天背景',

‎ui/src/views/application-overview/xpack-component/XPackDisplaySettingDialog.vue‎

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@
173173
<el-row class="w-full mb-8">
174174
<el-col :span="12">
175175
<h5 class="mb-8">
176-
{{
177-
$t('views.applicationOverview.SettingDisplayDialog.customThemeColor')
178-
}}
176+
{{ $t('views.applicationOverview.SettingDisplayDialog.customThemeColor') }}
179177
</h5>
180178
<div>
181179
<el-color-picker v-model="xpackForm.custom_theme.theme_color" />
@@ -188,11 +186,7 @@
188186
</el-col>
189187
<el-col :span="12">
190188
<h5 class="mb-8">
191-
{{
192-
$t(
193-
'views.applicationOverview.SettingDisplayDialog.headerTitleFontColor',
194-
)
195-
}}
189+
{{ $t('views.applicationOverview.SettingDisplayDialog.headerTitleFontColor') }}
196190
</h5>
197191
<el-color-picker v-model="xpackForm.custom_theme.header_font_color" />
198192
</el-col>
@@ -259,9 +253,7 @@
259253
</span>
260254
</div>
261255
<el-text type="info" size="small">
262-
{{
263-
$t('views.applicationOverview.SettingDisplayDialog.chatBackgroundMessage')
264-
}}
256+
{{ $t('views.applicationOverview.SettingDisplayDialog.chatBackgroundMessage') }}
265257
</el-text>
266258
</el-card>
267259
<!-- AI回复头像 -->
@@ -301,9 +293,7 @@
301293
}}</span>
302294
<span class="flex align-center">
303295
<el-checkbox v-model="xpackForm.show_user_avatar">
304-
{{
305-
$t('views.applicationOverview.SettingDisplayDialog.display')
306-
}}</el-checkbox
296+
{{ $t('views.applicationOverview.SettingDisplayDialog.display') }}</el-checkbox
307297
>
308298
<el-upload
309299
class="ml-8"
@@ -355,9 +345,7 @@
355345
}}</span>
356346
<el-checkbox
357347
v-model="xpackForm.draggable"
358-
:label="
359-
$t('views.applicationOverview.SettingDisplayDialog.draggablePosition')
360-
"
348+
:label="$t('views.applicationOverview.SettingDisplayDialog.draggablePosition')"
361349
/>
362350
</div>
363351
<el-row :gutter="8" class="w-full mb-8">
@@ -366,17 +354,13 @@
366354
<el-select v-model="xpackForm.float_location.x.type" style="width: 80px">
367355
<el-option
368356
:label="
369-
$t(
370-
'views.applicationOverview.SettingDisplayDialog.iconPosition.left',
371-
)
357+
$t('views.applicationOverview.SettingDisplayDialog.iconPosition.left')
372358
"
373359
value="left"
374360
/>
375361
<el-option
376362
:label="
377-
$t(
378-
'views.applicationOverview.SettingDisplayDialog.iconPosition.right',
379-
)
363+
$t('views.applicationOverview.SettingDisplayDialog.iconPosition.right')
380364
"
381365
value="right"
382366
/>
@@ -398,17 +382,13 @@
398382
<el-select v-model="xpackForm.float_location.y.type" style="width: 80px">
399383
<el-option
400384
:label="
401-
$t(
402-
'views.applicationOverview.SettingDisplayDialog.iconPosition.top',
403-
)
385+
$t('views.applicationOverview.SettingDisplayDialog.iconPosition.top')
404386
"
405387
value="top"
406388
/>
407389
<el-option
408390
:label="
409-
$t(
410-
'views.applicationOverview.SettingDisplayDialog.iconPosition.bottom',
411-
)
391+
$t('views.applicationOverview.SettingDisplayDialog.iconPosition.bottom')
412392
"
413393
value="bottom"
414394
/>
@@ -432,15 +412,11 @@
432412
<el-space direction="vertical" alignment="start" :size="2">
433413
<el-checkbox
434414
v-model="xpackForm.show_source"
435-
:label="
436-
$t('views.applicationOverview.SettingDisplayDialog.showSourceLabel')
437-
"
415+
:label="$t('views.applicationOverview.SettingDisplayDialog.showSourceLabel')"
438416
/>
439417
<el-checkbox
440418
v-model="xpackForm.show_exec"
441-
:label="
442-
$t('views.applicationOverview.SettingDisplayDialog.showExecutionDetail')
443-
"
419+
:label="$t('views.applicationOverview.SettingDisplayDialog.showExecutionDetail')"
444420
/>
445421
<el-checkbox
446422
v-model="xpackForm.show_history"
@@ -450,6 +426,10 @@
450426
v-model="xpackForm.show_guide"
451427
:label="$t('views.applicationOverview.SettingDisplayDialog.displayGuide')"
452428
/>
429+
<el-checkbox
430+
v-model="xpackForm.show_share"
431+
:label="$t('views.applicationOverview.SettingDisplayDialog.share')"
432+
/>
453433
<el-checkbox
454434
v-model="xpackForm.disclaimer"
455435
:label="$t('views.applicationOverview.SettingDisplayDialog.disclaimer')"
@@ -512,6 +492,7 @@ const defaultSetting = {
512492
show_history: true,
513493
draggable: true,
514494
show_guide: true,
495+
show_share: true,
515496
icon: '',
516497
icon_url: '',
517498
chat_background: '',
@@ -547,6 +528,7 @@ const xpackForm = ref<any>({
547528
show_history: true,
548529
draggable: false,
549530
show_guide: false,
531+
show_share: true,
550532
chat_background: '',
551533
chat_background_url: '',
552534
avatar: '',
@@ -621,6 +603,7 @@ const open = (data: any, content: any) => {
621603
xpackForm.value.language = data.language
622604
xpackForm.value.draggable = data.draggable
623605
xpackForm.value.show_guide = data.show_guide
606+
xpackForm.value.show_share = data.show_share
624607
imgUrl.value.avatar = data.avatar
625608
imgUrl.value.icon = data.icon
626609
imgUrl.value.chat_background = data.chat_background
@@ -710,6 +693,7 @@ defineExpose({ open })
710693
overflow: hidden;
711694
width: 330px;
712695
height: 520px;
696+
713697
.setting-preview-header {
714698
background: var(--app-header-bg-color);
715699
height: var(--app-header-height);

‎ui/src/views/chat/component/HistoryPanel.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<el-dropdown-item
9090
@click.stop="shareHandle()"
9191
:disabled="currentChatId !== row.id || chat_loading"
92+
v-if="applicationDetail?.show_share"
9293
>
9394
<AppIcon iconName="app-share" class="color-secondary"></AppIcon>
9495
{{ $t('aiChat.share') }}

0 commit comments

Comments
 (0)