Skip to content

Commit 8554be3

Browse files
committed
feat: model buildIn not disabled
1 parent c767c99 commit 8554be3

5 files changed

Lines changed: 32 additions & 11 deletions

File tree

electron/mapi/manager/plugin/llm.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const listProviders = async (): Promise<Provider[]> => {
4343
});
4444
}
4545
const storageData = await StorageMain.read("models", []);
46+
let buildInProviderData: any = null;
4647
if (storageData) {
4748
if (storageData.userProviders) {
4849
storageData.userProviders.forEach(provider => {
@@ -68,6 +69,7 @@ const listProviders = async (): Promise<Provider[]> => {
6869
});
6970
}
7071
if (storageData.providerData) {
72+
buildInProviderData = storageData.providerData["buildIn"] || null;
7173
for (const providerId in storageData.providerData) {
7274
const provider = results.find(p => p.id === providerId);
7375
if (provider) {
@@ -112,6 +114,10 @@ const listProviders = async (): Promise<Provider[]> => {
112114
editable: false,
113115
});
114116
}
117+
let enabled = true;
118+
if (buildInProviderData && 'enabled' in buildInProviderData) {
119+
enabled = buildInProviderData.enabled;
120+
}
115121
results.unshift({
116122
id: "buildIn",
117123
type: "openai",
@@ -128,7 +134,7 @@ const listProviders = async (): Promise<Provider[]> => {
128134
apiKey: lmApi.apiKey,
129135
apiHost: "",
130136
models: models,
131-
enabled: true,
137+
enabled: enabled,
132138
},
133139
});
134140
}

src/lang/en-US.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
"000fc206": "Zoom Out",
7373
"000ff33b": "Edit",
7474
"00100dfe": "Auto",
75+
"00103072": "能量",
7576
"001105f8": "View",
7677
"00114509": "Device",
7778
"0011478b": "Video",
@@ -243,6 +244,7 @@
243244
"3341e84f": "添加模型",
244245
"3345e9a5": "Add Role",
245246
"338045e9": "Command Line Tool",
247+
"33c7a7f9": "测试成功",
246248
"33d94d01": "Clear History",
247249
"3498bfe8": "添加供应商",
248250
"35f3e924": "Environment Settings",
@@ -277,6 +279,7 @@
277279
"41c4d108": "Visit Official Website",
278280
"41dff64a": "Extracting {name}",
279281
"41e0472e": "TTS",
282+
"429aa52c": "测试中,请稍候...",
280283
"42c281d4": "Follow system",
281284
"42ed4ed0": "Connect Device",
282285
"42fa058a": "Select Model",
@@ -343,4 +346,4 @@
343346
"7c1093b7": "从云端恢复",
344347
"7fca1c6b": "Import a model zip file on this page",
345348
"a0cf9088": "This product is open-source software and follows the GPL-3.0 license."
346-
}
349+
}

src/lang/source.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,8 @@
228228
"正常": "000d5f35",
229229
"每次询问": "32a57afe",
230230
"测试": "000dc7ea",
231+
"测试中,请稍候...": "429aa52c",
232+
"测试成功": "33c7a7f9",
231233
"添加": "000da405",
232234
"添加供应商": "3498bfe8",
233235
"添加模型": "3341e84f",
@@ -267,6 +269,7 @@
267269
"编辑供应商": "41589cf2",
268270
"编辑模型": "3bed4205",
269271
"缩小": "000fc206",
272+
"能量": "00103072",
270273
"自动": "00100dfe",
271274
"自动分离为独立窗口显示": "1b2e6e2e",
272275
"自动检测更新": "6e81e205",
@@ -338,4 +341,4 @@
338341
"音色": "0012e8df",
339342
"音速": "0012f68c",
340343
"默认端口 {port}": "3d329aff"
341-
}
344+
}

src/lang/zh-CN.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
"000fc206": "缩小",
7373
"000ff33b": "编辑",
7474
"00100dfe": "自动",
75+
"00103072": "能量",
7576
"001105f8": "视图",
7677
"00114509": "设备",
7778
"0011478b": "视频",
@@ -243,6 +244,7 @@
243244
"3341e84f": "添加模型",
244245
"3345e9a5": "添加角色",
245246
"338045e9": "命令行工具",
247+
"33c7a7f9": "测试成功",
246248
"33d94d01": "清空历史",
247249
"3498bfe8": "添加供应商",
248250
"35f3e924": "环境设置",
@@ -276,6 +278,7 @@
276278
"41c4d108": "访问官网",
277279
"41dff64a": "正在解压 {name}",
278280
"41e0472e": "语音合成",
281+
"429aa52c": "测试中,请稍候...",
279282
"42c281d4": "跟随系统",
280283
"42ed4ed0": "连接设备",
281284
"42fa058a": "选择模型",
@@ -341,4 +344,4 @@
341344
"7c1093b7": "从云端恢复",
342345
"7fca1c6b": "在本页面导入模型压缩包 zip 文件",
343346
"a0cf9088": "本产品为开源软件,遵循 GPL-3.0 license 协议。"
344-
}
347+
}

src/module/Model/store/model.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {t} from "../../../lang";
1313
import {useUserStore} from "../../../store/modules/user";
1414
import {watch} from "vue";
1515
import {AppConfig} from "../../../config";
16-
import {AbstractModelProvider} from "../provider/driver/base";
1716

1817
const userStore = useUserStore();
1918

@@ -31,7 +30,7 @@ const mapModelError = (e: any, provider: Provider) => {
3130
if (provider.id === "buildIn") {
3231
const msg = e + "";
3332
const showCharge = () => {
34-
window.$mapi.user
33+
$mapi.user
3534
.open({
3635
readyParam: {
3736
page: "ChargeLmApi",
@@ -100,7 +99,8 @@ export const modelStore = defineStore("model", {
10099
},
101100
});
102101
}
103-
const storageData = await window.$mapi.storage.read("models");
102+
let buildInProviderData: any = null;
103+
const storageData = await $mapi.storage.read("models");
104104
if (storageData) {
105105
if (storageData.userProviders) {
106106
storageData.userProviders.forEach(provider => {
@@ -126,6 +126,7 @@ export const modelStore = defineStore("model", {
126126
});
127127
}
128128
if (storageData.providerData) {
129+
buildInProviderData = storageData.providerData["buildIn"] || null;
129130
for (const providerId in storageData.providerData) {
130131
const provider = results.find(p => p.id === providerId);
131132
if (provider) {
@@ -156,9 +157,9 @@ export const modelStore = defineStore("model", {
156157
}
157158
}
158159
this.providers = results;
159-
await this.refreshBuildIn();
160+
await this.refreshBuildIn(buildInProviderData);
160161
},
161-
async refreshBuildIn() {
162+
async refreshBuildIn(buildInProviderData?: any) {
162163
if (userStore.data && userStore.data.lmApi && userStore.data.lmApi.models) {
163164
const lmApi = userStore.data.lmApi;
164165
const buildInProvider = this.providers.find(p => p.id === "buildIn");
@@ -176,6 +177,11 @@ export const modelStore = defineStore("model", {
176177
});
177178
}
178179
// console.log("model.init.buildIn", JSON.stringify({lmApi}, null, 2));
180+
let enabled = true;
181+
if (buildInProviderData && 'enabled' in buildInProviderData) {
182+
enabled = buildInProviderData.enabled;
183+
}
184+
console.log('model.init.buildIn', {enabled, buildInProviderData});
179185
this.providers.unshift({
180186
id: "buildIn",
181187
type: "openai",
@@ -192,7 +198,7 @@ export const modelStore = defineStore("model", {
192198
apiKey: lmApi.apiKey,
193199
apiHost: "",
194200
models: models,
195-
enabled: true,
201+
enabled: enabled,
196202
},
197203
});
198204
} else {
@@ -406,7 +412,7 @@ export const modelStore = defineStore("model", {
406412
}
407413
});
408414
const userProviders = model.providers.filter(provider => !provider.isSystem);
409-
await window.$mapi.storage.write("models", ObjectUtil.clone({providerData, userProviders}));
415+
await $mapi.storage.write("models", ObjectUtil.clone({providerData, userProviders}));
410416
}, 200),
411417
},
412418
});

0 commit comments

Comments
 (0)