Merge branch 'beta' into 'master'

fix: 多模型轮次积分消耗有误

See merge request !122

src/views/multi-model-dialogue/components/model-dialogue-item.vue

@@ -13,7 +13,6 @@ interface Props {
   modelListOptions: SelectOption[]
   totalNum: number
   isCurrent: boolean
-  modelPoints: number
 }
 
 const { t } = useI18n()
@@ -139,7 +138,6 @@ function scrollToBottom() {
             v-model:model-config="modelConfig"
             :model-list-options="modelListOptions"
             :is-current="isCurrent"
-            :model-points="modelPoints"
             @update-config="(modelConfig) => emit('updateConfig', modelConfig)"
             @reset-conversation="emit('resetConversation')"
           />

src/views/multi-model-dialogue/components/model-setting.vue

@@ -9,7 +9,6 @@ import { useSystemLanguageStore } from '@/store/modules/system-language'
 interface Props {
   modelListOptions: SelectOption[]
   isCurrent: boolean
-  modelPoints: number
 }
 
 const { t } = useI18n()
@@ -26,7 +25,6 @@ const systemLanguageStore = useSystemLanguageStore()
 const modelConfig = defineModel<MultiModelDialogueItem>('modelConfig', { required: true })
 
 const currentDiversityMode = ref('balance')
-const modelConsumePoints = ref(props.modelPoints || 0)
 
 const currentModelNickName = computed({
   get: () => (modelConfig.value.modelNickName === '' ? undefined : modelConfig.value.modelNickName),
@@ -44,22 +42,24 @@ const isEnLanguage = computed(() => {
 })
 
 const totalConsumePoints = computed(() => (communicationTurn: number) => {
-  if (!modelConsumePoints.value) {
+  const modelConsumePoints = modelConfig.value.modelPoints
+
+  if (!modelConsumePoints) {
     return t('common_module.free')
   }
 
   switch (communicationTurn) {
     case 1:
-      return t('common_module.points_per_time', { count: (modelConsumePoints.value * 1).toFixed(1) })
+      return t('common_module.points_per_time', { count: (modelConsumePoints * 1).toFixed(1) })
     case 5:
-      return t('common_module.points_per_time', { count: (modelConsumePoints.value * 1).toFixed(1) })
+      return t('common_module.points_per_time', { count: (modelConsumePoints * 1).toFixed(1) })
     case 10:
-      return t('common_module.points_per_time', { count: (modelConsumePoints.value * 2).toFixed(1) })
+      return t('common_module.points_per_time', { count: (modelConsumePoints * 2).toFixed(1) })
     case 15:
-      return t('common_module.points_per_time', { count: (modelConsumePoints.value * 3).toFixed(1) })
+      return t('common_module.points_per_time', { count: (modelConsumePoints * 3).toFixed(1) })
   }
 
-  return t('common_module.points_per_time', { count: modelConsumePoints.value.toFixed(1) })
+  return t('common_module.points_per_time', { count: modelConsumePoints.toFixed(1) })
 })
 
 watch(
@@ -139,7 +139,7 @@ function modelListRenderTag({ option }: { option: SelectOption }) {
 // 更新大模型
 function handleUpdateLargeModel(_value: string, option: SelectOption) {
   modelConfig.value.icon = option.icon as string
-  modelConsumePoints.value = (option.points || 0) as number
+  modelConfig.value.modelPoints = (option.points || 0) as number
   emit('resetConversation')
   handleUpdateAgentConfig()
 }

src/views/multi-model-dialogue/multi-model-dialogue.vue

@@ -34,7 +34,6 @@ const isFullPageLoading = ref(false)
 const agentId = ref('')
 const agentApplicationConfig = ref<PersonalAppConfigState>(defaultPersonalAppConfigState())
 const multiModelDialogueList = ref<MultiModelDialogueItem[]>([])
-const currentModelPoints = ref(0)
 
 let modelListOptions = reactive<SelectOption[]>([])
 
@@ -92,6 +91,7 @@ function modelDialogueFactory() {
     topP: 0.1,
     temperature: 1,
     communicationTurn: 5,
+    modelPoints: 0,
     agentSystem: '',
     controller: null,
     isAnswerResponseWait: false,
@@ -154,7 +154,7 @@ async function handleGetLargeModelInfo() {
 
   if (res.code === 0) {
     multiModelDialogueList.value[0].icon = res.data.icon
-    currentModelPoints.value = res.data.models?.[0].points || 0
+    multiModelDialogueList.value[0].modelPoints = res.data.models?.[0].points || 0
     isFullPageLoading.value = false
   }
 }
@@ -316,7 +316,6 @@ function handleBlockMessageResponse() {
           :key="modelDialogueItem.id"
           :model-dialogue-item="modelDialogueItem"
           :is-current="modelDialogueItem.id === multiModelDialogueList[0].id"
-          :model-points="currentModelPoints"
           :model-list-options="modelListOptions"
           :total-num="multiModelDialogueList.length"
           @update-config="handleSavePersonalAppConfig"

src/views/multi-model-dialogue/types.d.ts

@@ -19,6 +19,7 @@ export interface MultiModelDialogueItem {
   temperature: number
   agentSystem: string
   communicationTurn: number
+  modelPoints: number
   controller: AbortController | null
   isAnswerResponseWait: boolean
   messageList: Map<string, MessageItemInterface>