Merge pull request #21 from ravilushqa/revert-18-refactor

Revert "Refactor"

Author: ravilushqa

.github/workflows/golangci-lint.yml

@@ -25,11 +25,12 @@ jobs:
       - name: Build description and review commands
         run: |
           cd gpt-pullrequest-updater
-          make build
+          go build -o description ./cmd/description
+          go build -o review ./cmd/review
 
       - name: Update Pull Request Description
         run: |
-          ./gpt-pullrequest-updater/bin/description
+          ./gpt-pullrequest-updater/description
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           OPENAI_TOKEN: ${{ secrets.OPENAI_TOKEN }}
@@ -40,7 +41,7 @@ jobs:
       - name: Review Pull Request
         if: github.event.action == 'opened'
         run: |
-          ./gpt-pullrequest-updater/bin/review
+          ./gpt-pullrequest-updater/review
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           OPENAI_TOKEN: ${{ secrets.OPENAI_TOKEN }}

.github/workflows/gpt_pullrequest_updater.yml

@@ -101,11 +101,12 @@ jobs:
          - name: Build description and review commands
            run: |
               cd gpt-pullrequest-updater
-              make build
+              go build -o description ./cmd/description
+              go build -o review ./cmd/review
 
          - name: Update Pull Request Description
            run: |
-              ./gpt-pullrequest-updater/bin/description
+              ./gpt-pullrequest-updater/description
            env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               OPENAI_TOKEN: ${{ secrets.OPENAI_TOKEN }}
@@ -116,7 +117,7 @@ jobs:
          - name: Review Pull Request
            if: github.event.action == 'opened'
            run: |
-              ./gpt-pullrequest-updater/bin/review
+              ./gpt-pullrequest-updater/review
            env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               OPENAI_TOKEN: ${{ secrets.OPENAI_TOKEN }}

.gitignore

@@ -0,0 +1,10 @@
+package main
+
+var opts struct {
+	GithubToken string `long:"gh-token" env:"GITHUB_TOKEN" description:"GitHub token" required:"true"`
+	OpenAIToken string `long:"openai-token" env:"OPENAI_TOKEN" description:"OpenAI token" required:"true"`
+	Owner       string `long:"owner" env:"OWNER" description:"GitHub owner" required:"true"`
+	Repo        string `long:"repo" env:"REPO" description:"GitHub repo" required:"true"`
+	PRNumber    int    `long:"pr-number" env:"PR_NUMBER" description:"Pull request number" required:"true"`
+	Test        bool   `long:"test" env:"TEST" description:"Test mode"`
+}

.golangci.yaml

@@ -11,18 +11,8 @@ import (
 
 	ghClient "github.com/ravilushqa/gpt-pullrequest-updater/github"
 	oAIClient "github.com/ravilushqa/gpt-pullrequest-updater/openai"
-	"github.com/ravilushqa/gpt-pullrequest-updater/review"
 )
 
-var opts struct {
-	GithubToken string `long:"gh-token" env:"GITHUB_TOKEN" description:"GitHub token" required:"true"`
-	OpenAIToken string `long:"openai-token" env:"OPENAI_TOKEN" description:"OpenAI token" required:"true"`
-	Owner       string `long:"owner" env:"OWNER" description:"GitHub owner" required:"true"`
-	Repo        string `long:"repo" env:"REPO" description:"GitHub repo" required:"true"`
-	PRNumber    int    `long:"pr-number" env:"PR_NUMBER" description:"Pull request number" required:"true"`
-	Test        bool   `long:"test" env:"TEST" description:"Test mode"`
-}
-
 func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
@@ -53,17 +43,16 @@ func run(ctx context.Context) error {
 		return fmt.Errorf("error getting commits: %w", err)
 	}
 
-	comments, err := review.GenerateCommentsFromDiff(ctx, openAIClient, diff)
+	comments, err := processFiles(ctx, openAIClient, diff)
 	if err != nil {
 		return err
 	}
 
 	if opts.Test {
 		fmt.Printf("Comments: %v \n", comments)
-		return nil
 	}
 
-	err = review.PushComments(ctx, githubClient, opts.Owner, opts.Repo, opts.PRNumber, comments)
+	err = createComments(ctx, githubClient, comments)
 	if err != nil {
 		return fmt.Errorf("error creating comments: %w", err)
 	}

Makefile

@@ -1,4 +1,4 @@
-package review
+package main
 
 import (
 	"context"
@@ -7,17 +7,10 @@ import (
 	"github.com/google/go-github/v51/github"
 	"github.com/sashabaranov/go-openai"
 
+	ghClient "github.com/ravilushqa/gpt-pullrequest-updater/github"
 	oAIClient "github.com/ravilushqa/gpt-pullrequest-updater/openai"
 )
 
-type PullRequestUpdater interface {
-	CreatePullRequestComment(ctx context.Context, owner, repo string, number int, comment *github.PullRequestComment) (*github.PullRequestComment, error)
-}
-
-type Completer interface {
-	ChatCompletion(ctx context.Context, messages []openai.ChatCompletionMessage) (string, error)
-}
-
 type Review struct {
 	Quality Quality `json:"quality"`
 	Issues  []Issue `json:"issues"`
@@ -37,7 +30,7 @@ const (
 	Neutral Quality = "neutral"
 )
 
-func GenerateCommentsFromDiff(ctx context.Context, openAIClient Completer, diff *github.CommitsComparison) ([]*github.PullRequestComment, error) {
+func processFiles(ctx context.Context, openAIClient *oAIClient.Client, diff *github.CommitsComparison) ([]*github.PullRequestComment, error) {
 	var comments []*github.PullRequestComment
 
 	for i, file := range diff.Files {
@@ -97,10 +90,10 @@ func GenerateCommentsFromDiff(ctx context.Context, openAIClient Completer, diff
 	return comments, nil
 }
 
-func PushComments(ctx context.Context, prUpdated PullRequestUpdater, owner, repo string, number int, comments []*github.PullRequestComment) error {
+func createComments(ctx context.Context, githubClient *ghClient.Client, comments []*github.PullRequestComment) error {
 	for i, c := range comments {
 		fmt.Printf("creating comment: %s %d/%d\n", *c.Path, i+1, len(comments))
-		if _, err := prUpdated.CreatePullRequestComment(ctx, owner, repo, number, c); err != nil {
+		if _, err := githubClient.CreatePullRequestComment(ctx, opts.Owner, opts.Repo, opts.PRNumber, c); err != nil {
 			return fmt.Errorf("error creating comment: %w", err)
 		}
 	}

README.md

@@ -1,4 +1,4 @@
-package review
+package main
 
 import (
 	"encoding/json"

cmd/review/config.go

@@ -1,4 +1,4 @@
-package review
+package main
 
 import (
 	"reflect"

cmd/review/main.go

@@ -6,22 +6,17 @@ require (
 	github.com/google/go-github/v51 v51.0.0
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/sashabaranov/go-openai v1.7.0
-	github.com/stretchr/testify v1.8.2
 	golang.org/x/oauth2 v0.6.0
 )
 
 require (
 	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
 	github.com/cloudflare/circl v1.1.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
 	golang.org/x/crypto v0.7.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

review/review.go renamed to cmd/review/review.go

@@ -3,9 +3,6 @@ github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0g
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/cloudflare/circl v1.1.0 h1:bZgT/A+cikZnKIwn7xL2OBj012Bmvho/o6RpRvv3GKY=
 github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
@@ -19,18 +16,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sashabaranov/go-openai v1.7.0 h1:D1dBXoZhtf/aKNu6WFf0c7Ah2NM30PZ/3Mqly6cZ7fk=
 github.com/sashabaranov/go-openai v1.7.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
@@ -60,8 +47,3 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

review/utils.go renamed to cmd/review/utils.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 )
 
-const ticketURLFormat = "%s/browse/%s"
+const ticketUrlFormat = "%s/browse/%s"
 
 // ExtractJiraTicketID returns the first JIRA ticket ID found in the input string.
 func ExtractJiraTicketID(s string) (string, error) {
@@ -25,5 +25,5 @@ func ExtractJiraTicketID(s string) (string, error) {
 }
 
 func GenerateJiraTicketURL(jiraURL, ticketID string) string {
-	return fmt.Sprintf(ticketURLFormat, jiraURL, ticketID)
+	return fmt.Sprintf(ticketUrlFormat, jiraURL, ticketID)
 }

review/utils_test.go renamed to cmd/review/utils_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/sashabaranov/go-openai"
 )
 
-//go:embed prompts/review
+//go:embed prompt-review.txt
 var PromptReview string
 
 const (