diff --git a/desktop/core/providers.mjs b/desktop/core/providers.mjs index 6e3f5dd..49e7f58 100644 --- a/desktop/core/providers.mjs +++ b/desktop/core/providers.mjs @@ -61,7 +61,12 @@ export async function listModels(c,signal){ export async function testModel(c,vision=false,signal,testImage){ let capabilities=[];if(c.protocol==='ollama'){const j=await(await request(c,'api/show',{model:c.model},signal)).json();capabilities=j.capabilities||[];} const r=await complete(c,vision?'观察图片中的主要颜色。返回 JSON {"color":"颜色中文名"}。':'Return only JSON {"ok":true}',vision?[testImage]:[],signal); - if(vision){if(!r.data.color)throw Error('图片测试返回格式错误');if(!capabilities.includes('vision'))capabilities.push('vision-tested');} + if(vision){ + const color=r.data.color??r.data.main_color??r.data.colour??r.data['主要颜色']??r.data['颜色']??r.data['主色']; + if(!color)throw Error('图片测试返回格式错误:模型未按要求输出 color 字段,请更换视觉能力更强的模型'); + r.data.color=String(color); + if(!capabilities.includes('vision'))capabilities.push('vision-tested'); + } else if(r.data.ok!==true)throw Error('模型没有通过 JSON 文本测试'); return {...r,capabilities,visionVerified:vision||capabilities.includes('vision'),textVerified:true}; }