Просмотр исходного кода

Merge remote-tracking branch 'origin/alpha' into alpha

t0ng7u 6 месяцев назад
Родитель
Сommit
a0e6a72b69
2 измененных файлов с 7 добавлено и 2 удалено
  1. 1 1
      dto/openai_response.go
  2. 6 1
      relay/channel/gemini/relay-gemini.go

+ 1 - 1
dto/openai_response.go

@@ -110,7 +110,7 @@ func (c *ChatCompletionsStreamResponseChoiceDelta) GetReasoningContent() string
 
 
 func (c *ChatCompletionsStreamResponseChoiceDelta) SetReasoningContent(s string) {
 func (c *ChatCompletionsStreamResponseChoiceDelta) SetReasoningContent(s string) {
 	c.ReasoningContent = &s
 	c.ReasoningContent = &s
-	c.Reasoning = &s
+	//c.Reasoning = &s
 }
 }
 
 
 type ToolCallResponse struct {
 type ToolCallResponse struct {

+ 6 - 1
relay/channel/gemini/relay-gemini.go

@@ -935,7 +935,7 @@ func GeminiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *
 				}
 				}
 			}
 			}
 		}
 		}
-
+		logger.LogDebug(c, fmt.Sprintf("info.SendResponseCount = %d", info.SendResponseCount))
 		if info.SendResponseCount == 0 {
 		if info.SendResponseCount == 0 {
 			// send first response
 			// send first response
 			emptyResponse := helper.GenerateStartEmptyResponse(id, createAt, info.UpstreamModelName, nil)
 			emptyResponse := helper.GenerateStartEmptyResponse(id, createAt, info.UpstreamModelName, nil)
@@ -953,6 +953,11 @@ func GeminiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *
 				if response.IsFinished() {
 				if response.IsFinished() {
 					response.Choices[0].FinishReason = nil
 					response.Choices[0].FinishReason = nil
 				}
 				}
+			} else {
+				err = handleStream(c, info, emptyResponse)
+				if err != nil {
+					logger.LogError(c, err.Error())
+				}
 			}
 			}
 		}
 		}