refactor(provider): extract common commit generation logic

Author: m7medVision

internal/provider/common.go

@@ -0,0 +1,51 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/openai/openai-go"
+)
+
+// commonProvider holds the common fields and methods for OpenAI-compatible providers.
+type commonProvider struct {
+	client *openai.Client
+	model  string
+}
+
+// generateCommitMessages is a helper function to generate commit messages using the OpenAI API.
+func (c *commonProvider) generateCommitMessages(ctx context.Context, diff string) ([]string, error) {
+	if diff == "" {
+		return nil, fmt.Errorf("no diff provided")
+	}
+
+	prompt := fmt.Sprintf("Based on the following git diff, generate 10 conventional commit messages. Each message should be on a new line, without any numbering or bullet points:\n\n%s", diff)
+
+	params := openai.ChatCompletionNewParams{
+		Model: openai.ChatModel(c.model),
+		Messages: []openai.ChatCompletionMessageParamUnion{
+			{OfSystem: &openai.ChatCompletionSystemMessageParam{Content: openai.ChatCompletionSystemMessageParamContentUnion{OfString: openai.String("You are a helpful assistant that generates git commit messages.")}}},
+			{OfUser: &openai.ChatCompletionUserMessageParam{Content: openai.ChatCompletionUserMessageParamContentUnion{OfString: openai.String(prompt)}}},
+		},
+	}
+
+	resp, err := c.client.Chat.Completions.New(ctx, params)
+	if err != nil {
+		return nil, fmt.Errorf("error making request to OpenAI compatible API: %w", err)
+	}
+
+	if len(resp.Choices) == 0 {
+		return nil, fmt.Errorf("no commit messages generated")
+	}
+
+	content := resp.Choices[0].Message.Content
+	messages := strings.Split(content, "\n")
+	var cleanMessages []string
+	for _, msg := range messages {
+		if strings.TrimSpace(msg) != "" {
+			cleanMessages = append(cleanMessages, strings.TrimSpace(msg))
+		}
+	}
+	return cleanMessages, nil
+}

internal/provider/openai.go

@@ -3,19 +3,15 @@ package provider
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/openai/openai-go"
 	"github.com/openai/openai-go/option"
 )
 
-
 type OpenAIProvider struct {
-	client *openai.Client
-	model  string
+	commonProvider
 }
 
-
 func NewOpenAIProvider(apiKey, model string) *OpenAIProvider {
 	if model == "" {
 		model = "gpt-3.5-turbo"
@@ -24,15 +20,15 @@ func NewOpenAIProvider(apiKey, model string) *OpenAIProvider {
 		option.WithAPIKey(apiKey),
 	)
 	return &OpenAIProvider{
-		client: &client,
-		model:  model,
+		commonProvider: commonProvider{
+			client: &client,
+			model:  model,
+		},
 	}
 }
 
-
-
 func (o *OpenAIProvider) GenerateCommitMessage(ctx context.Context, diff string) (string, error) {
-	messages, err := o.GenerateCommitMessages(ctx, diff)
+	messages, err := o.generateCommitMessages(ctx, diff)
 	if err != nil {
 		return "", err
 	}
@@ -42,42 +38,6 @@ func (o *OpenAIProvider) GenerateCommitMessage(ctx context.Context, diff string)
 	return messages[0], nil
 }
 
-
 func (o *OpenAIProvider) GenerateCommitMessages(ctx context.Context, diff string) ([]string, error) {
-	if diff == "" {
-		return nil, fmt.Errorf("no diff provided")
-	}
-
-
-	prompt := fmt.Sprintf("Based on the following git diff, generate 10 conventional commit messages. Each message should be on a new line, without any numbering or bullet points:\n\n%s", diff)
-
-
-	params := openai.ChatCompletionNewParams{
-		Model: openai.ChatModel(o.model),
-		Messages: []openai.ChatCompletionMessageParamUnion{
-			{OfSystem: &openai.ChatCompletionSystemMessageParam{Content: openai.ChatCompletionSystemMessageParamContentUnion{OfString: openai.String("You are a helpful assistant that generates git commit messages.")}}},
-			{OfUser: &openai.ChatCompletionUserMessageParam{Content: openai.ChatCompletionUserMessageParamContentUnion{OfString: openai.String(prompt)}}},
-		},
-	}
-
-
-	resp, err := o.client.Chat.Completions.New(ctx, params)
-	if err != nil {
-		return nil, fmt.Errorf("error making request to OpenAI: %w", err)
-	}
-
-	if len(resp.Choices) == 0 {
-		return nil, fmt.Errorf("no commit messages generated")
-	}
-
-
-	content := resp.Choices[0].Message.Content
-	messages := strings.Split(content, "\n")
-	var cleanMessages []string
-	for _, msg := range messages {
-		if strings.TrimSpace(msg) != "" {
-			cleanMessages = append(cleanMessages, strings.TrimSpace(msg))
-		}
-	}
-	return cleanMessages, nil
+	return o.generateCommitMessages(ctx, diff)
 }

internal/provider/openrouter.go

@@ -3,15 +3,13 @@ package provider
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/openai/openai-go"
 	"github.com/openai/openai-go/option"
 )
 
 type OpenRouterProvider struct {
-	client *openai.Client
-	model  string
+	commonProvider
 }
 
 func NewOpenRouterProvider(apiKey, model string) *OpenRouterProvider {
@@ -26,13 +24,15 @@ func NewOpenRouterProvider(apiKey, model string) *OpenRouterProvider {
 		option.WithHeaderAdd("X-Title", "LazyCommit"),
 	)
 	return &OpenRouterProvider{
-		client: &client,
-		model:  model,
+		commonProvider: commonProvider{
+			client: &client,
+			model:  model,
+		},
 	}
 }
 
 func (o *OpenRouterProvider) GenerateCommitMessage(ctx context.Context, diff string) (string, error) {
-	messages, err := o.GenerateCommitMessages(ctx, diff)
+	messages, err := o.generateCommitMessages(ctx, diff)
 	if err != nil {
 		return "", err
 	}
@@ -43,36 +43,5 @@ func (o *OpenRouterProvider) GenerateCommitMessage(ctx context.Context, diff str
 }
 
 func (o *OpenRouterProvider) GenerateCommitMessages(ctx context.Context, diff string) ([]string, error) {
-	if diff == "" {
-		return nil, fmt.Errorf("no diff provided")
-	}
-
-	prompt := fmt.Sprintf("Based on the following git diff, generate 10 conventional commit messages. Each message should be on a new line, without any numbering or bullet points:\n\n%s", diff)
-
-	params := openai.ChatCompletionNewParams{
-		Model: openai.ChatModel(o.model),
-		Messages: []openai.ChatCompletionMessageParamUnion{
-			{OfSystem: &openai.ChatCompletionSystemMessageParam{Content: openai.ChatCompletionSystemMessageParamContentUnion{OfString: openai.String("You are a helpful assistant that generates git commit messages.")}}},
-			{OfUser: &openai.ChatCompletionUserMessageParam{Content: openai.ChatCompletionUserMessageParamContentUnion{OfString: openai.String(prompt)}}},
-		},
-	}
-
-	resp, err := o.client.Chat.Completions.New(ctx, params)
-	if err != nil {
-		return nil, fmt.Errorf("error making request to OpenAI: %w", err)
-	}
-
-	if len(resp.Choices) == 0 {
-		return nil, fmt.Errorf("no commit messages generated")
-	}
-
-	content := resp.Choices[0].Message.Content
-	messages := strings.Split(content, "\n")
-	var cleanMessages []string
-	for _, msg := range messages {
-		if strings.TrimSpace(msg) != "" {
-			cleanMessages = append(cleanMessages, strings.TrimSpace(msg))
-		}
-	}
-	return cleanMessages, nil
+	return o.generateCommitMessages(ctx, diff)
 }