fix retry loop

g-linville · g-linville · commit 92876e8c062e · 2024-08-29T19:37:07.000-04:00
Signed-off-by: Grant Linville &lt;grant@acorn.io&gt;
diff --git a/pkg/openai/client.go b/pkg/openai/client.go
@@ -453,7 +453,7 @@ func (c *Client) contextLimitRetryLoop(ctx context.Context, request openai.ChatC
 		request.Messages = dropMessagesOverCount(maxTokens, request.Messages)
 		response, err = c.call(ctx, request, id, status)
 		if err == nil {
-			break
+			return response, nil
 		}
 
 		var apiError *openai.APIError
@@ -465,7 +465,7 @@ func (c *Client) contextLimitRetryLoop(ctx context.Context, request openai.ChatC
 		return nil, err
 	}
 
-	return response, nil
+	return nil, err
 }
 
 func appendMessage(msg types.CompletionMessage, response openai.ChatCompletionStreamResponse) types.CompletionMessage {

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ func (c *Client) contextLimitRetryLoop(ctx context.Context, request openai.ChatC`
`453`	`453`	`request.Messages = dropMessagesOverCount(maxTokens, request.Messages)`
`454`	`454`	`response, err = c.call(ctx, request, id, status)`
`455`	`455`	`if err == nil {`
`456`		`- break`
	`456`	`+ return response, nil`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`var apiError *openai.APIError`
`@@ -465,7 +465,7 @@ func (c *Client) contextLimitRetryLoop(ctx context.Context, request openai.ChatC`
`465`	`465`	`return nil, err`
`466`	`466`	`}`
`467`	`467`
`468`		`- return response, nil`
	`468`	`+ return nil, err`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`func appendMessage(msg types.CompletionMessage, response openai.ChatCompletionStreamResponse) types.CompletionMessage {`