Skip to content

fix: ollama model auto load #1093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerob13 merged 1 commit into from
Nov 12, 2025
Merged

fix: ollama model auto load #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/renderer/settings/components/OllamaProviderSettingsDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
:function-call="model.functionCall"
:reasoning="model.reasoning"
:enable-search="model.enableSearch"
:hide-enable-toggle="true"
@enabled-change="handleModelEnabledChange(model.name, $event)"
@config-changed="refreshModels"
/>
Expand Down
8 changes: 5 additions & 3 deletions src/renderer/src/components/settings/ModelConfigItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{{ type }}
</span>
<Button
v-if="!enabled"
v-if="!hideEnableToggle && !enabled"
variant="link"
size="icon"
class="w-7 h-7 text-xs text-normal rounded-lg"
Expand All @@ -39,7 +39,7 @@
<Icon icon="lucide:circle-minus" class="w-4 h-4 text-destructive" />
</Button>
<Button
v-if="enabled"
v-if="!hideEnableToggle && enabled"
variant="link"
size="icon"
class="w-7 h-7 text-xs text-normal rounded-lg"
Expand Down Expand Up @@ -100,10 +100,12 @@ withDefaults(
enableSearch?: boolean
type?: ModelType
changeable?: boolean
hideEnableToggle?: boolean
}>(),
{
type: ModelType.Chat,
changeable: true
changeable: true,
hideEnableToggle: false
}
)

Expand Down
19 changes: 13 additions & 6 deletions src/renderer/src/stores/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,11 @@ export const useSettingsStore = defineStore('settings', () => {
const previousState = getLocalModelEnabledState(providerId, modelId)
updateLocalModelStatus(providerId, modelId, enabled)

const provider = providers.value.find((p) => p.id === providerId)
if (provider?.apiType === 'ollama') {
return
}

try {
await llmP.updateModelStatus(providerId, modelId, enabled)
// 调用成功后，刷新该 provider 的模型列表
Expand Down Expand Up @@ -1463,9 +1468,6 @@ export const useSettingsStore = defineStore('settings', () => {
)

const localModels = getOllamaLocalModels(providerId)
const modelNames = localModels.map((model) => model.name)
const modelStatusMap =
modelNames.length > 0 ? await configP.getBatchModelStatus(providerId, modelNames) : {}

const ollamaModelsAsGlobal = await Promise.all(
localModels.map(async (model) => {
Expand Down Expand Up @@ -1502,8 +1504,7 @@ export const useSettingsStore = defineStore('settings', () => {

const maxTokens = modelConfig?.maxTokens ?? existingModel?.maxTokens ?? 2048

const statusFromStore = modelStatusMap[model.name]
const enabled = statusFromStore ?? existingModel?.enabled ?? true
const enabled = true

const resolvedType =
modelConfig?.type ??
Expand Down Expand Up @@ -1556,14 +1557,20 @@ export const useSettingsStore = defineStore('settings', () => {
const enabledOllamaModels = ollamaModelsAsGlobal.filter((model) => model.enabled)

if (enabledIndex !== -1) {
enabledModels.value[enabledIndex].models = enabledOllamaModels
if (enabledOllamaModels.length > 0) {
enabledModels.value[enabledIndex].models = enabledOllamaModels
} else {
enabledModels.value.splice(enabledIndex, 1)
}
} else if (enabledOllamaModels.length > 0) {
enabledModels.value.push({
providerId,
models: enabledOllamaModels
})
}

enabledModels.value = [...enabledModels.value]

await initOrUpdateSearchAssistantModel()
}

Expand Down