添加国外服务器中转ai请求数据,添加gemini
This commit is contained in:
parent
b334b8185d
commit
36c39974a7
|
|
@ -147,6 +147,7 @@ const (
|
||||||
ModelTypeQianfan = "qianfan"
|
ModelTypeQianfan = "qianfan"
|
||||||
ModelTypeTongyi = "tongyi"
|
ModelTypeTongyi = "tongyi"
|
||||||
ModelTypeHunyuan = "hunyuan"
|
ModelTypeHunyuan = "hunyuan"
|
||||||
|
ModelTypeGemini = "gemini"
|
||||||
KnowledgeBaseServerResponseType = "kbase_query_resp"
|
KnowledgeBaseServerResponseType = "kbase_query_resp"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -296,7 +296,6 @@ func OpenAIForeignAIResponseToGeneralMassageAndSendMsgQueue(data *proto.ReceiveM
|
||||||
//PromptTokens = chunk.Usage.PromptTokens
|
//PromptTokens = chunk.Usage.PromptTokens
|
||||||
}
|
}
|
||||||
//将消息存入数据库
|
//将消息存入数据库
|
||||||
|
|
||||||
if chunk.Created < 0 { //这里由于没有返回结束标志,所以用该字段来判断
|
if chunk.Created < 0 { //这里由于没有返回结束标志,所以用该字段来判断
|
||||||
tokens := chunk.Usage.TotalTokens
|
tokens := chunk.Usage.TotalTokens
|
||||||
PromptTokens := chunk.Usage.PromptTokens
|
PromptTokens := chunk.Usage.PromptTokens
|
||||||
|
|
@ -304,6 +303,6 @@ func OpenAIForeignAIResponseToGeneralMassageAndSendMsgQueue(data *proto.ReceiveM
|
||||||
DOSaveMessageAndToken(&data.IMParamContext, answer, "openai_"+data.PlatForm, tokens, PromptTokens)
|
DOSaveMessageAndToken(&data.IMParamContext, answer, "openai_"+data.PlatForm, tokens, PromptTokens)
|
||||||
} else {
|
} else {
|
||||||
//流式消息,暂存到redis
|
//流式消息,暂存到redis
|
||||||
worker.SetRedis(data.IMParamContext.Channel+"_stream_msg", answer)
|
worker.SetRedisWithExpire(data.IMParamContext.Channel+"_stream_msg", answer, time.Second*30)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -174,6 +174,8 @@ func WSReceiveMessageServiceV2(modelParam proto.ModelParam, ctx *proto.IMParamCo
|
||||||
Tongyi(modelParam, ctx)
|
Tongyi(modelParam, ctx)
|
||||||
case proto.ModelTypeHunyuan:
|
case proto.ModelTypeHunyuan:
|
||||||
generalModel.OpenAI(modelParam, ctx, ctx.ModelType)
|
generalModel.OpenAI(modelParam, ctx, ctx.ModelType)
|
||||||
|
case proto.ModelTypeGemini:
|
||||||
|
generalModel.OpenAIForeignAI(modelParam, ctx, ctx.ModelType)
|
||||||
default:
|
default:
|
||||||
resErr, resID = errors.New("model type not exist:"+ctx.ModelType), 0
|
resErr, resID = errors.New("model type not exist:"+ctx.ModelType), 0
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue