Skip to content

Commit d5c82f6

Browse files
committed
♻️ refactor: refactor the key
1 parent e8ed847 commit d5c82f6

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

src/const/settings/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,18 @@ export const DEFAULT_LLM_CONFIG: GlobalLLMConfig = {
103103
},
104104
ollama: {
105105
enabled: false,
106+
enabledModels: filterEnabledModels(OllamaProvider),
106107
endpoint: '',
107-
models: filterEnabledModels(OllamaProvider),
108108
},
109109
openAI: {
110110
OPENAI_API_KEY: '',
111111
enabled: true,
112-
models: filterEnabledModels(OpenAIProvider),
112+
enabledModels: filterEnabledModels(OpenAIProvider),
113113
},
114114
openrouter: {
115115
apiKey: '',
116116
enabled: false,
117-
models: filterEnabledModels(OpenRouterProvider),
117+
enabledModels: filterEnabledModels(OpenRouterProvider),
118118
},
119119
perplexity: {
120120
apiKey: '',

src/store/global/slices/settings/selectors/modelConfig.test.ts

+9-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,22 @@ describe('modelConfigSelectors', () => {
1616
settings: {
1717
languageModel: {
1818
ollama: {
19-
models: ['llava'],
19+
enabledModels: ['llava'],
2020
},
2121
},
2222
},
2323
} as GlobalSettingsState) as unknown as GlobalStore;
2424

2525
const ollamaList = modelConfigSelectors.modelSelectList(s).find((r) => r.id === 'ollama');
2626

27-
expect(ollamaList?.chatModels).toEqual([]);
27+
expect(ollamaList?.chatModels.find((c) => c.id === 'llava')).toEqual({
28+
displayName: 'LLaVA 7B',
29+
functionCall: false,
30+
hidden: false,
31+
id: 'llava',
32+
tokens: 4000,
33+
vision: true,
34+
});
2835
});
2936
});
3037
});

src/types/settings/modelProvider.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export interface OpenAIConfig {
2121
*/
2222
customModelName?: string;
2323
enabled: boolean;
24+
enabledModels?: string[];
2425
endpoint?: string;
25-
models?: string[];
2626
useAzure?: boolean;
2727
}
2828

@@ -45,15 +45,15 @@ export interface AWSBedrockConfig {
4545
export interface OllamaConfig {
4646
customModelName?: string;
4747
enabled?: boolean;
48+
enabledModels: string[];
4849
endpoint?: string;
49-
models: string[];
5050
}
5151

5252
export interface OpenRouterConfig {
5353
apiKey?: string;
5454
customModelName?: string;
5555
enabled?: boolean;
56-
models: string[];
56+
enabledModels: string[];
5757
}
5858

5959
export interface TogetherAIConfig {

0 commit comments

Comments
 (0)