Implement auto-commit and push with improved AI requests

Author: chand1012

cmd/ask.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/chand1012/ottodocs/pkg/ai"
 	"github.com/chand1012/ottodocs/pkg/config"
+	"github.com/chand1012/ottodocs/pkg/git"
 	"github.com/chand1012/ottodocs/pkg/utils"
 )
 
@@ -66,7 +67,7 @@ Requires a path to a repository or file as a positional argument.`,
 			}
 
 			// index the repo
-			repo, err := utils.GetRepo(repoPath, ignoreFilePath, ignoreGitignore)
+			repo, err := git.GetRepo(repoPath, ignoreFilePath, ignoreGitignore)
 			if err != nil {
 				log.Errorf("Error processing repo: %s", err)
 				os.Exit(1)

cmd/commit.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/chand1012/ottodocs/pkg/ai"
 	"github.com/chand1012/ottodocs/pkg/config"
+	"github.com/chand1012/ottodocs/pkg/git"
 	"github.com/spf13/cobra"
 )
 
@@ -27,6 +28,8 @@ var commitCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
+		log.Info("Generating commit message...")
+
 		c := exec.Command("git", "diff")
 		diffBytes, err := c.Output()
 		if err != nil {
@@ -42,7 +45,36 @@ var commitCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		fmt.Println("Commit message:", msg)
+		if auto || push {
+			log.Info("Adding and committing...")
+			output, err := git.AddAll()
+			if err != nil {
+				log.Error(err)
+				os.Exit(1)
+			}
+			fmt.Println(output)
+			output, err = git.Commit(msg)
+			if err != nil {
+				log.Error(err)
+				os.Exit(1)
+			}
+			fmt.Println(output)
+			if push {
+				log.Info("Pushing...")
+				output, err = git.Push()
+				if err != nil {
+					log.Error(err)
+					os.Exit(1)
+				}
+				fmt.Println(output)
+			}
+		}
+
+		if plain {
+			fmt.Println(msg)
+		} else {
+			fmt.Println("Commit message:", msg)
+		}
 	},
 }
 
@@ -51,4 +83,6 @@ func init() {
 
 	commitCmd.Flags().BoolVarP(&conventional, "conventional", "c", false, "use conventional commits")
 	commitCmd.Flags().BoolVarP(&plain, "plain", "p", false, "no output formatting")
+	commitCmd.Flags().BoolVarP(&auto, "auto", "a", false, "automatically add all and commit with the generated message")
+	commitCmd.Flags().BoolVar(&push, "push", false, "automatically push to the current branch")
 }

cmd/docs.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/chand1012/ottodocs/pkg/ai"
 	"github.com/chand1012/ottodocs/pkg/config"
+	"github.com/chand1012/ottodocs/pkg/git"
 	"github.com/chand1012/ottodocs/pkg/utils"
 	"github.com/spf13/cobra"
 )
@@ -63,7 +64,7 @@ search for files in the directory and document them. If a single file is specifi
 		}
 
 		if info.IsDir() {
-			repo, err := utils.GetRepo(repoPath, ignoreFilePath, ignoreGitignore)
+			repo, err := git.GetRepo(repoPath, ignoreFilePath, ignoreGitignore)
 			if err != nil {
 				log.Errorf("Error: %s", err)
 				os.Exit(1)

cmd/setModel.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2023 NAME HERE <EMAIL ADDRESS>
+Copyright © 2023 Chandler <chandler@chand1012.dev>
 */
 package cmd
 

cmd/vars.go

@@ -22,6 +22,8 @@ var overwriteOriginal bool
 
 var conventional bool // use conventional commits
 var plain bool
+var auto bool
+var push bool
 
 var log = l.NewWithOptions(os.Stderr, l.Options{
 	Level:           l.InfoLevel,

cmd/version.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2023 NAME HERE <EMAIL ADDRESS>
+Copyright © 2023 Chandler <chandler@chand1012.dev>
 */
 package cmd
 

go.mod

@@ -58,6 +58,7 @@ require (
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/sashabaranov/go-openai v1.9.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/skeema/knownhosts v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect

go.sum

@@ -204,6 +204,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sashabaranov/go-openai v1.9.0 h1:NoiO++IISxxJ1pRc0n7uZvMGMake0G+FJ1XPwXtprsA=
+github.com/sashabaranov/go-openai v1.9.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=

pkg/ai/req.go

@@ -1,55 +1,40 @@
 package ai
 
 import (
+	"context"
 	"errors"
 
-	gopenai "github.com/CasualCodersProjects/gopenai"
-	ai_types "github.com/CasualCodersProjects/gopenai/types"
-	"github.com/chand1012/ottodocs/pkg/calc"
 	"github.com/chand1012/ottodocs/pkg/config"
+	"github.com/sashabaranov/go-openai"
 )
 
 func request(systemMsg, userMsg string, conf *config.Config) (string, error) {
 
-	openai := gopenai.NewOpenAI(&gopenai.OpenAIOpts{
-		APIKey: conf.APIKey,
-	})
-
-	messages := []ai_types.ChatMessage{
-		{
-			Content: systemMsg,
-			Role:    "system",
-		},
-		{
-			Content: userMsg,
-			Role:    "user",
+	c := openai.NewClient(conf.APIKey)
+	ctx := context.Background()
+
+	req := openai.ChatCompletionRequest{
+		Model: conf.Model,
+		Messages: []openai.ChatCompletionMessage{
+			{
+				Content: systemMsg,
+				Role:    openai.ChatMessageRoleSystem,
+			},
+			{
+				Content: userMsg,
+				Role:    openai.ChatMessageRoleUser,
+			},
 		},
 	}
 
-	tokens, err := calc.PreciseTokens(messages[0].Content, messages[1].Content)
-	if err != nil {
-		return "", err
-	}
-
-	req := ai_types.NewDefaultChatRequest("")
-	req.Messages = messages
-	req.MaxTokens = calc.GetMaxTokens(conf.Model) - tokens
-	req.Model = conf.Model
-
-	if req.MaxTokens < 0 {
-		return "", errors.New("the prompt is too long")
-	}
-
-	resp, err := openai.CreateChat(req)
+	resp, err := c.CreateChatCompletion(ctx, req)
 	if err != nil {
 		return "", err
 	}
 
 	if len(resp.Choices) == 0 {
-		return "", errors.New("no choices returned. Check your OpenAI API key")
+		return "", errors.New("no choices returned")
 	}
 
-	message := resp.Choices[0].Message.Content
-
-	return message, nil
+	return resp.Choices[0].Message.Content, nil
 }

pkg/git/commit.go

@@ -0,0 +1,16 @@
+package git
+
+// git add -A
+func AddAll() (string, error) {
+	return git("add", "-A")
+}
+
+// git commit -am <message>
+func Commit(message string) (string, error) {
+	return git("commit", "-am", message)
+}
+
+// git push
+func Push() (string, error) {
+	return git("push")
+}