|
|
@@ -611,9 +611,9 @@ func getResponseToolCall(item *GeminiPart) *dto.ToolCallResponse {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func responseGeminiChat2OpenAI(response *GeminiChatResponse) *dto.OpenAITextResponse {
|
|
|
+func responseGeminiChat2OpenAI(c *gin.Context, response *GeminiChatResponse) *dto.OpenAITextResponse {
|
|
|
fullTextResponse := dto.OpenAITextResponse{
|
|
|
- Id: fmt.Sprintf("chatcmpl-%s", common.GetUUID()),
|
|
|
+ Id: helper.GetResponseID(c),
|
|
|
Object: "chat.completion",
|
|
|
Created: common.GetTimestamp(),
|
|
|
Choices: make([]dto.OpenAITextResponseChoice, 0, len(response.Candidates)),
|
|
|
@@ -754,7 +754,7 @@ func streamResponseGeminiChat2OpenAI(geminiResponse *GeminiChatResponse) (*dto.C
|
|
|
|
|
|
func GeminiChatStreamHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*dto.OpenAIErrorWithStatusCode, *dto.Usage) {
|
|
|
// responseText := ""
|
|
|
- id := fmt.Sprintf("chatcmpl-%s", common.GetUUID())
|
|
|
+ id := helper.GetResponseID(c)
|
|
|
createAt := common.GetTimestamp()
|
|
|
var usage = &dto.Usage{}
|
|
|
var imageCount int
|
|
|
@@ -849,7 +849,7 @@ func GeminiChatHandler(c *gin.Context, resp *http.Response, info *relaycommon.Re
|
|
|
StatusCode: resp.StatusCode,
|
|
|
}, nil
|
|
|
}
|
|
|
- fullTextResponse := responseGeminiChat2OpenAI(&geminiResponse)
|
|
|
+ fullTextResponse := responseGeminiChat2OpenAI(c, &geminiResponse)
|
|
|
fullTextResponse.Model = info.UpstreamModelName
|
|
|
usage := dto.Usage{
|
|
|
PromptTokens: geminiResponse.UsageMetadata.PromptTokenCount,
|