mirror of
https://github.com/xiaoyiweb/YiAi.git
synced 2025-11-15 13:43:46 +08:00
更新模型列表/新增gpt-4o,gpt-4o-all,claude-3.5等模型识图/文件分析功能
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "service",
|
||||
"version": "2.5.0",
|
||||
"version": "2.6.0",
|
||||
"description": "",
|
||||
"author": "",
|
||||
"private": true,
|
||||
|
||||
@@ -4,7 +4,7 @@ export enum VerificationUseStatusEnum {
|
||||
}
|
||||
|
||||
export const ModelsMapCn = {
|
||||
1: '系统内置大模型',
|
||||
1: 'Ai大模型',
|
||||
2: '百度千帆大模型',
|
||||
3: '清华智谱大模型'
|
||||
}
|
||||
@@ -97,7 +97,7 @@ export class NineStore implements NineStoreInterface {
|
||||
let nextNumTokensEstimate = 0;
|
||||
// messages.push({ role: 'system', content: systemMessage, name })
|
||||
if (systemMessage) {
|
||||
const specialModels = ['gemini-pro', 'ERNIE','hunyuan'];
|
||||
const specialModels = ['gemini-pro', 'ERNIE', 'hunyuan'];
|
||||
const isSpecialModel = activeModel && specialModels.some((specialModel) => activeModel.includes(specialModel));
|
||||
if (isSpecialModel) {
|
||||
messages.push({ role: 'user', content: systemMessage, name });
|
||||
@@ -108,8 +108,9 @@ export class NineStore implements NineStoreInterface {
|
||||
}
|
||||
const systemMessageOffset = messages.length;
|
||||
let round = 0;
|
||||
const uploadModels = ['gpt-4-vision-preview', 'gpt-4o', 'claude-3-5-sonnet-20240620'];
|
||||
// 特殊处理 gpt-4-vision-preview 模型
|
||||
if (activeModel === 'gpt-4-vision-preview' && imageUrl) {
|
||||
if (uploadModels.includes(activeModel) && imageUrl) {
|
||||
const content = [
|
||||
{
|
||||
type: 'text',
|
||||
@@ -123,14 +124,22 @@ export class NineStore implements NineStoreInterface {
|
||||
},
|
||||
];
|
||||
messages.push({ role: 'user', content: content, name });
|
||||
} else if (uploadModels.includes(activeModel) && !imageUrl) {
|
||||
const content = [
|
||||
{
|
||||
type: 'text',
|
||||
text: text,
|
||||
},
|
||||
];
|
||||
messages.push({ role: 'user', content: content, name });
|
||||
} else {
|
||||
// 处理 gpt-4-all 模型
|
||||
if (model === 'gpt-4-all' && imageUrl) {
|
||||
if ((model === 'gpt-4-all' || model === 'gpt-4o-all') && imageUrl) {
|
||||
text = imageUrl + '\n' + text;
|
||||
}
|
||||
messages.push({ role: 'user', content: text, name });
|
||||
}
|
||||
// Logger.debug(`发送的参数:${messages}`)
|
||||
// Logger.debug(`发送的参数:${messages}`);
|
||||
|
||||
let nextMessages = messages;
|
||||
do {
|
||||
@@ -148,12 +157,18 @@ export class NineStore implements NineStoreInterface {
|
||||
|
||||
// 特别处理包含 imageUrl 的消息
|
||||
if (imageUrl) {
|
||||
if (activeModel === 'gpt-4-vision-preview') {
|
||||
content = [
|
||||
{ type: 'text', text: text },
|
||||
{ type: 'image_url', image_url: { url: imageUrl } },
|
||||
];
|
||||
if (uploadModels.includes(activeModel)) {
|
||||
if (role === 'assistant') {
|
||||
content = [{ type: 'text', text: text }];
|
||||
} else {
|
||||
content = [
|
||||
{ type: 'text', text: text },
|
||||
{ type: 'image_url', image_url: { url: imageUrl } },
|
||||
];
|
||||
}
|
||||
}
|
||||
} else if (!imageUrl && uploadModels.includes(activeModel)) {
|
||||
content = [{ type: 'text', text: text }];
|
||||
}
|
||||
|
||||
/* 将本轮消息插入到列表中 */
|
||||
|
||||
Reference in New Issue
Block a user