Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/presenter/configPresenter/modelDefaultSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1676,5 +1676,17 @@ export const defaultModelsSettings: DefaultModelSetting[] = [
functionCall: false,
reasoning: false,
type: ModelType.Embedding
},
{
id: 'embedding',
name: 'embedding',
temperature: 0.0,
maxTokens: 4096,
contextLength: 4096,
match: ['embedding', 'embed'],
vision: false,
functionCall: false,
reasoning: false,
type: ModelType.Embedding
}
]
17 changes: 15 additions & 2 deletions src/renderer/src/components/ModelSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</template>
<script setup lang="ts">
import { useI18n } from 'vue-i18n'
import { ref, computed, onMounted } from 'vue'
import { ref, computed, onMounted, PropType } from 'vue'
import Input from './ui/input/Input.vue'
// import Badge from './ui/badge/Badge.vue'
import { useChatStore } from '@/stores/chat'
Expand All @@ -59,6 +59,14 @@ const providers = ref<{ id: string; name: string; models: RENDERER_MODEL_META[]
const emit = defineEmits<{
(e: 'update:model', model: RENDERER_MODEL_META, providerId: string): void
}>()

const props = defineProps({
type: {
type: Array as PropType<ModelType[]>,
default: undefined // ← explicit for clarity
}
})

const filteredProviders = computed(() => {
if (!keyword.value) return providers.value
return providers.value
Expand Down Expand Up @@ -100,7 +108,12 @@ onMounted(async () => {
return {
id: providerId,
name: provider?.name || providerId,
models: models.filter((model) => model.type === ModelType.Chat)
models:
!props.type || props.type.length === 0
? models
: models.filter(
(model) => model.type !== undefined && props.type!.includes(model.type as ModelType)
)
}
})
} catch (error) {
Expand Down
5 changes: 4 additions & 1 deletion src/renderer/src/components/NewThread.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@
</Button>
</PopoverTrigger>
<PopoverContent align="start" class="p-0 w-80">
<ModelSelect @update:model="handleModelUpdate" />
<ModelSelect
:type="[ModelType.Chat, ModelType.ImageGeneration]"
@update:model="handleModelUpdate"
/>
</PopoverContent>
</Popover>
<Popover v-model:open="settingsPopoverOpen" @update:open="handleSettingsPopoverUpdate">
Expand Down
7 changes: 6 additions & 1 deletion src/renderer/src/components/TitleView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
</Button>
</PopoverTrigger>
<PopoverContent align="start" class="p-0 w-80">
<ModelSelect @update:model="handleModelUpdate" />
<ModelSelect
:type="[ModelType.Chat, ModelType.ImageGeneration]"
@update:model="handleModelUpdate"
/>
</PopoverContent>
</Popover>
</div>
Expand Down Expand Up @@ -71,6 +74,8 @@ import { onMounted, ref, watch } from 'vue'
import { useChatStore } from '@/stores/chat'
import { usePresenter } from '@/composables/usePresenter'
import { useThemeStore } from '@/stores/theme'
import { ModelType } from '@shared/model'

const configPresenter = usePresenter('configPresenter')

const { t } = useI18n()
Expand Down
6 changes: 5 additions & 1 deletion src/renderer/src/components/mcp-config/mcpServerForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import type { RENDERER_MODEL_META } from '@shared/presenter'
import { MCP_MARKETPLACE_URL, HIGRESS_MCP_MARKETPLACE_URL } from './const'
import { usePresenter } from '@/composables/usePresenter'
import { useThemeStore } from '@/stores/theme'
import { ModelType } from '@shared/model'

const { t } = useI18n()
const { toast } = useToast()
Expand Down Expand Up @@ -793,7 +794,10 @@ HTTP-Referer=deepchatai.cn`
</Button>
</PopoverTrigger>
<PopoverContent class="w-80 p-0">
<ModelSelect @update:model="handleImageModelSelect" />
<ModelSelect
:type="[ModelType.Chat, ModelType.ImageGeneration]"
@update:model="handleImageModelSelect"
/>
</PopoverContent>
</Popover>
</div>
Expand Down
6 changes: 5 additions & 1 deletion src/renderer/src/components/settings/CommonSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@
</Button>
</PopoverTrigger>
<PopoverContent class="w-80 p-0">
<ModelSelect @update:model="handleSearchModelSelect" />
<ModelSelect
:type="[ModelType.Chat, ModelType.ImageGeneration]"
@update:model="handleSearchModelSelect"
/>
</PopoverContent>
</Popover>
</div>
Expand Down Expand Up @@ -371,6 +374,7 @@ import { nanoid } from 'nanoid'
import { useThemeStore } from '@/stores/theme'
import { useSoundStore } from '@/stores/sound'
import { useLanguageStore } from '@/stores/language'
import { ModelType } from '@shared/model'

const devicePresenter = usePresenter('devicePresenter')
const configPresenter = usePresenter('configPresenter')
Expand Down
13 changes: 10 additions & 3 deletions src/renderer/src/stores/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,17 @@ export const useSettingsStore = defineStore('settings', () => {
}

// 如果没有找到匹配优先级的模型,返回第一个可用的模型
if (enabledModels.value[0]?.models.length > 0) {

const model = enabledModels.value
.flatMap((provider) =>
provider.models.map((m) => ({ ...m, providerId: provider.providerId }))
)
.find((m) => m.type === ModelType.Chat || m.type === ModelType.ImageGeneration)

if (model) {
return {
model: enabledModels.value[0].models[0],
providerId: enabledModels.value[0].providerId
model: model,
providerId: model.providerId
}
}

Expand Down