Skip to content

Commit 76ba6a3

Browse files
committed
Fix the determination of empty responses in the speech model
1 parent 7434990 commit 76ba6a3

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

relay/channel/openai/adaptor.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,12 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
106106

107107
var responseText string
108108
var toolCount int
109-
err, responseText, toolCount = StreamHandler(c, resp, meta.Mode, meta.ActualModelName, meta.FixedContent)
109+
if meta.FixedContent != "" {
110+
err, responseText, toolCount = StreamHandler(c, resp, meta.Mode, meta.ActualModelName, meta.FixedContent)
111+
} else {
112+
err, responseText, toolCount = StreamHandler(c, resp, meta.Mode, meta.ActualModelName, meta.FixedContent)
113+
}
114+
110115
aitext = responseText
111116
if usage == nil || usage.TotalTokens == 0 {
112117
usage = ResponseText2Usage(responseText, meta.ActualModelName, meta.PromptTokens)
@@ -117,7 +122,10 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
117122
}
118123
usage.CompletionTokens += toolCount * 7
119124
if usage.CompletionTokens == 0 {
120-
if config.BlankReplyRetryEnabled {
125+
if config.BlankReplyRetryEnabled &&
126+
!strings.HasPrefix(meta.OriginModelName, "tts") &&
127+
!strings.HasPrefix(meta.OriginModelName, "whisper-1") &&
128+
!strings.HasPrefix(meta.OriginModelName, "text") {
121129
return "", nil, &model.ErrorWithStatusCode{
122130
Error: model.Error{
123131
Message: "No completion tokens generated",
@@ -129,6 +137,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *util.Rel
129137
}
130138
}
131139
}
140+
132141
} else {
133142
switch meta.Mode {
134143
case constant.RelayModeImagesGenerations:

0 commit comments

Comments
 (0)