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"