feat: custom system instruction

Author: amalhanaja

cmd/cli/main.go

@@ -6,9 +6,4 @@ import (
 
 func main() {
 	cli.Run()
-	// pullRequestId := os.Getenv("BITBUCKET_PR_ID")
-	// if pullRequestId == "" {
-	// 	panic("Failed Get PULL REQUEST ID")
-	// }
-	// cli.RunE(pullRequestId)
 }

internal/app/cli/app.go

@@ -1,12 +1,6 @@
 package cli
 
 import (
-	infraBitbucket "codebleu/internal/infrastructure/http/bitbucket"
-	infraGemini "codebleu/internal/infrastructure/thirdparty/gemini"
-	codeAssistantUseCase "codebleu/internal/usecase/codeassistant"
-	gitRepoUseCase "codebleu/internal/usecase/gitrepo"
-	llmUseCase "codebleu/internal/usecase/llm"
-	"context"
 	"log"
 	"os"
 )
@@ -16,23 +10,3 @@ func Run() {
 		log.Fatalln(err)
 	}
 }
-
-func RunE(pullRequestId string) {
-	cfg := NewConfigFromEnv()
-	bitbucketClient := infraBitbucket.NewClient(
-		cfg.BitbucketRepositoryAccessConfig.Workspace,
-		cfg.BitbucketRepositoryAccessConfig.RepoSlug,
-		cfg.BitbucketRepositoryAccessConfig.AccessToken,
-	)
-	geminiClient := infraGemini.NewClient("gemini-1.5-flash", cfg.GeminiConfig.ApiKey)
-	getPullRequest := gitRepoUseCase.GetPullRequest(bitbucketClient)
-	postPullRequestComment := gitRepoUseCase.PostPullRequestComment(bitbucketClient)
-	sendPromptUseCase := llmUseCase.SendPromptUseCase(geminiClient)
-	reviewPullRequest := codeAssistantUseCase.ReviewPullRequest(sendPromptUseCase)
-	reviewAndCommentPullRequest := codeAssistantUseCase.ReviewAndCommentPullRequest(getPullRequest, reviewPullRequest, postPullRequestComment)
-
-	_, err := reviewAndCommentPullRequest.Invoke(context.Background(), pullRequestId)
-	if err != nil {
-		panic(err)
-	}
-}

internal/app/cli/cli.go

@@ -1,10 +1,13 @@
 package cli
 
 import (
+	"codebleu/internal/domain/codeassistant"
 	"codebleu/internal/infrastructure/factories/gitrepo"
 	"codebleu/internal/infrastructure/factories/llm"
 	"context"
 	"errors"
+	"fmt"
+	"io/ioutil"
 
 	codeAssistantUseCase "codebleu/internal/usecase/codeassistant"
 	gitRepoUseCase "codebleu/internal/usecase/gitrepo"
@@ -22,9 +25,10 @@ func NewCliApp() *cli.App {
 	cliApp.Flags = []cli.Flag{
 		&cli.StringFlag{
 			Name:     "model",
-			Usage:    `uses model to review pull request (options: "gemini-1.5-flash", "gemini-1.5-pro", "gemini-1.0-pro")`,
+			Usage:    `uses model to review pull request (options: "gemini-1.5-flash" (default), "gemini-1.5-pro", "gemini-1.0-pro")`,
 			Aliases:  []string{"m"},
 			EnvVars:  []string{"MODEL"},
+			Value:    "gemini-1.5-flash",
 			Required: true,
 		},
 		&cli.StringFlag{
@@ -40,6 +44,11 @@ func NewCliApp() *cli.App {
 			EnvVars:  []string{"PULL_REQUEST_ID"},
 			Required: true,
 		},
+		&cli.StringFlag{
+			Name:    "system-instruction",
+			Usage:   "Custom system instruction for review pull request diff chages",
+			EnvVars: []string{"SYSTEM_INSTRUCTION"},
+		},
 	}
 	cliApp.Action = action
 
@@ -63,12 +72,27 @@ func action(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
+	systemInstructionPath := ctx.String("system-instruction")
+	systemInstruction := ""
+	if systemInstructionPath != "" {
+		content, err := ioutil.ReadFile(systemInstructionPath)
+		if err != nil {
+			return errors.Join(err, fmt.Errorf("failed read file %s", systemInstructionPath))
+		}
+		systemInstruction = string(content)
+	}
 	getPullRequest := gitRepoUseCase.GetPullRequest(remoteRepo)
 	postPullRequestComment := gitRepoUseCase.PostPullRequestComment(remoteRepo)
 	sendPromptUseCase := llmUseCase.SendPromptUseCase(llmRepo)
 	reviewPullRequest := codeAssistantUseCase.ReviewPullRequest(sendPromptUseCase)
 	reviewAndCommentPullRequest := codeAssistantUseCase.ReviewAndCommentPullRequest(getPullRequest, reviewPullRequest, postPullRequestComment)
-	if _, err := reviewAndCommentPullRequest.Invoke(context.Background(), ctx.String("id")); err != nil {
+	if _, err := reviewAndCommentPullRequest.Invoke(
+		context.Background(),
+		codeassistant.ReviewAndCommentPullRequestInput{
+			PullRequestId:     ctx.String("id"),
+			SystemInstruction: systemInstruction,
+		},
+	); err != nil {
 		return err
 	}
 	return nil

internal/domain/codeassistant/entity.go

@@ -9,6 +9,11 @@ type PullRequestReviewInput struct {
 	SystemInstruction string
 }
 
+type ReviewAndCommentPullRequestInput struct {
+	PullRequestId     string
+	SystemInstruction string
+}
+
 type ReviewResult struct {
 	Path    string `json:"path"`
 	Comment string `json:"comment_in_markdown"`

internal/usecase/codeassistant/review_and_comment_pull_request.go

@@ -15,20 +15,21 @@ type reviewAndCommentPullRequest struct {
 }
 
 // Invoke implements usecase.UseCase.
-func (r *reviewAndCommentPullRequest) Invoke(ctx context.Context, input string) (interface{}, error) {
-	pullRequest, err := r.getPullRequest.Invoke(ctx, input)
+func (r *reviewAndCommentPullRequest) Invoke(ctx context.Context, input domain.ReviewAndCommentPullRequestInput) (interface{}, error) {
+	pullRequest, err := r.getPullRequest.Invoke(ctx, input.PullRequestId)
 	if err != nil {
 		return nil, err
 	}
 	reviewResults, err := r.reviewPullRequest.Invoke(ctx, domain.PullRequestReviewInput{
-		PullRequest: pullRequest,
+		PullRequest:       pullRequest,
+		SystemInstruction: input.SystemInstruction,
 	})
 	if err != nil {
 		return nil, err
 	}
 	for _, reviewResult := range reviewResults {
 		_, postCommentErr := r.postPullRequestComment.Invoke(ctx, gitRepoDomain.PostPullRequestCommentInput{
-			PullRequestId: input,
+			PullRequestId: input.PullRequestId,
 			CommitHash:    pullRequest.CommitHash,
 			Path:          reviewResult.Path,
 			Comment:       reviewResult.Comment,
@@ -50,7 +51,7 @@ func ReviewAndCommentPullRequest(
 	getPullRequest usecase.UseCase[string, *gitRepoDomain.PullRequest],
 	reviewPullRequest usecase.UseCase[domain.PullRequestReviewInput, []domain.ReviewResult],
 	postPullRequestComment usecase.UseCase[gitRepoDomain.PostPullRequestCommentInput, interface{}],
-) usecase.UseCase[string, interface{}] {
+) usecase.UseCase[domain.ReviewAndCommentPullRequestInput, interface{}] {
 	return &reviewAndCommentPullRequest{
 		reviewPullRequest:      reviewPullRequest,
 		postPullRequestComment: postPullRequestComment,