fix: improve reliability and validation of OpenAI title generation

- Add retry logic when generating pull request titles, retrying up to 3 times if the response is empty
- Trim whitespace from generated pull request titles
- Add error handling for cases when the OpenAI API returns no choices
- Disallow reasoning content in OpenAI completions, returning an error if present
- Set enable_thinking to false in the OpenAI chat completion template arguments

fixed #242

Signed-off-by: appleboy <[email protected]>

Author: appleboy

cmd/commit.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"html"
 	"os"
 	"path"
@@ -163,15 +164,28 @@ var commitCmd = &cobra.Command{
 				return err
 			}
 
-			// Generate title for pull request
+			// Generate title for pull request with retry if empty
 			color.Cyan("Generating title for pull request...")
+			maxRetries := 3
+			retryCount := 0
+		retryTitle:
 			resp, err := client.Completion(cmd.Context(), out)
 			if err != nil {
 				return err
 			}
-			summarizeTitle := resp.Content
+			summarizeTitle := strings.TrimSpace(resp.Content)
 			color.Magenta(resp.Usage.String())
 
+			if len(summarizeTitle) == 0 {
+				if retryCount < maxRetries {
+					retryCount++
+					color.Cyan("Empty title response, retrying (%d/%d)...", retryCount, maxRetries)
+					time.Sleep(500 * time.Millisecond)
+					goto retryTitle
+				}
+				return fmt.Errorf("failed to get valid title after %d attempts", maxRetries)
+			}
+
 			// Lowercase the first character of first word of the commit message and remove the trailing period
 			summarizeTitle = strings.TrimRight(strings.ToLower(string(summarizeTitle[0]))+summarizeTitle[1:], ".")
 			data[prompt.SummarizeTitleKey] = strings.TrimSpace(summarizeTitle)

provider/openai/openai.go

@@ -159,6 +159,9 @@ func (c *Client) CreateChatCompletion(
 				Content: content,
 			},
 		},
+		ChatTemplateKwargs: map[string]any{
+			"enable_thinking": false,
+		},
 	}
 
 	if checkOSeriesModels.MatchString(c.model) {
@@ -180,6 +183,13 @@ func (c *Client) completion(
 	if err != nil {
 		return nil, err
 	}
+	if len(r.Choices) == 0 {
+		return nil, fmt.Errorf("no choices returned from API")
+	}
+	// Do not support reasoning content for now.
+	if r.Choices[0].Message.ReasoningContent != "" {
+		return nil, fmt.Errorf("reasoning model is not supported")
+	}
 	resp.Content = r.Choices[0].Message.Content
 	resp.Usage = r.Usage
 	return resp, nil