Improve ask, add verbose mode on some commands

Author: chand1012

cmd/ask.go

@@ -7,17 +7,29 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 
+	"github.com/chand1012/git2gpt/prompt"
 	"github.com/chand1012/memory"
+	l "github.com/charmbracelet/log"
 	"github.com/spf13/cobra"
 
 	"github.com/chand1012/ottodocs/pkg/ai"
+	"github.com/chand1012/ottodocs/pkg/calc"
 	"github.com/chand1012/ottodocs/pkg/config"
 	"github.com/chand1012/ottodocs/pkg/git"
 	"github.com/chand1012/ottodocs/pkg/utils"
 )
 
+// move this to memory package eventually
+func sortByScore(fragments []memory.MemoryFragment) []memory.MemoryFragment {
+	sort.Slice(fragments, func(i, j int) bool {
+		return fragments[i].Score > fragments[j].Score
+	})
+	return fragments
+}
+
 // askCmd represents the ask command
 var askCmd = &cobra.Command{
 	Use:   "ask",
@@ -30,7 +42,13 @@ Requires a path to a repository or file as a positional argument.`,
 		}
 		return nil
 	}),
+	PreRun: func(cmd *cobra.Command, args []string) {
+		if verbose {
+			log.SetLevel(l.DebugLevel)
+		}
+	},
 	Run: func(cmd *cobra.Command, args []string) {
+		var answer string
 		repoPath := args[0]
 		var fileName string
 		conf, err := config.Load()
@@ -42,12 +60,14 @@ Requires a path to a repository or file as a positional argument.`,
 		}
 
 		if chatPrompt == "" {
+			log.Debug("User did not enter a question. Prompting for one...")
 			fmt.Println("Please enter a question: ")
 			fmt.Scanln(&chatPrompt)
 			// strip the newline character
 			chatPrompt = strings.TrimRight(chatPrompt, " \n")
 		}
 
+		log.Debug("Getting file contents...")
 		info, err := os.Stat(repoPath)
 		if err != nil {
 			log.Errorf("Error getting file info: %s", err)
@@ -56,16 +76,19 @@ Requires a path to a repository or file as a positional argument.`,
 		// check if the first arg is a file or a directory
 		// if it's a file, ask a question about that file directly
 		if info.IsDir() {
+			log.Debug("Constructing repo memory...")
 			// Define a temporary path for the index file
 			testIndexPath := filepath.Join(args[0], ".index.memory")
 
+			log.Debug("Creating memory index...")
 			// Create a new memory index
 			m, _, err := memory.New(testIndexPath)
 			if err != nil {
 				log.Errorf("Failed to create memory index: %s", err)
 				os.Exit(1)
 			}
 
+			log.Debug("Indexing repo...")
 			// index the repo
 			repo, err := git.GetRepo(repoPath, ignoreFilePath, ignoreGitignore)
 			if err != nil {
@@ -82,38 +105,75 @@ Requires a path to a repository or file as a positional argument.`,
 				}
 			}
 
+			log.Debug("Searching memory index...")
 			// search the memory index
 			results, err := m.Search(chatPrompt)
 			if err != nil {
 				log.Errorf("Failed to search memory index: %s", err)
 				os.Exit(1)
 			}
 
+			log.Debug("Results extracted. Destroying memory index...")
+			// close the memory index
 			m.Destroy()
 
-			// get the top fragment by average score
-			top := memory.TopFragmentAvg(results)
-			fileName = top.ID
+			log.Debug("Sorting results...")
+			sortedFragments := sortByScore(results)
+
+			log.Debug("Getting file contents...")
+			var files []prompt.GitFile
+			for _, result := range sortedFragments {
+				for _, file := range repo.Files {
+					if file.Path == result.ID {
+						files = append(files, file)
+					}
+				}
+			}
+
+			if len(files) == 0 {
+				log.Error("No results found.")
+				os.Exit(1)
+			}
+
+			log.Debug("Asking chatGPT question...")
+			answer, err = ai.Question(files, chatPrompt, conf)
+			if err != nil {
+				log.Errorf("Error asking question: %s", err)
+				os.Exit(1)
+			}
 		} else {
+			log.Debug("Getting file contents...")
 			fileName = repoPath
-		}
-
-		fmt.Println("Asking question about " + fileName + "...")
+			content, err := utils.LoadFile(fileName)
+			if err != nil {
+				log.Errorf("Error loading file: %s", err)
+				os.Exit(1)
+			}
 
-		content, err := utils.LoadFile(fileName)
-		if err != nil {
-			log.Errorf("Error loading file: %s", err)
-			os.Exit(1)
-		}
+			log.Debug("Calculating tokens and constructing file...")
+			tokens, err := calc.PreciseTokens(content)
+			if err != nil {
+				log.Errorf("Error calculating tokens: %s", err)
+				os.Exit(1)
+			}
 
-		resp, err := ai.Question(fileName, content, chatPrompt, conf)
+			files := []prompt.GitFile{
+				{
+					Path:     fileName,
+					Contents: content,
+					Tokens:   int64(tokens),
+				},
+			}
 
-		if err != nil {
-			log.Errorf("Error asking question: %s", err)
-			os.Exit(1)
+			log.Debug("Asking chatGPT question...")
+			answer, err = ai.Question(files, chatPrompt, conf)
+			if err != nil {
+				log.Errorf("Error asking question: %s", err)
+				os.Exit(1)
+			}
 		}
 
-		fmt.Println("Answer:", resp)
+		fmt.Println("Answer:", answer)
 	},
 }
 
@@ -122,4 +182,5 @@ func init() {
 	askCmd.Flags().StringVarP(&chatPrompt, "question", "q", "", "The question to ask")
 	askCmd.Flags().BoolVarP(&ignoreGitignore, "ignore-gitignore", "g", false, "ignore .gitignore file")
 	askCmd.Flags().StringVarP(&ignoreFilePath, "ignore", "n", "", "path to .gptignore file")
+	askCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
 }

cmd/cmd.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 
+	l "github.com/charmbracelet/log"
 	"github.com/spf13/cobra"
 
 	"github.com/chand1012/ottodocs/pkg/ai"
@@ -20,6 +21,11 @@ var cmdCmd = &cobra.Command{
 	Short: "Have ChatGPT suggest a command to run next",
 	Long: `Have ChatGPT suggest a command to run next. This command will use your shell history to suggest a command to run next.
 This command is only supported on MacOS and Linux using Bash or Zsh. Windows and other shells coming soon!`,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		if verbose {
+			log.SetLevel(l.DebugLevel)
+		}
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		conf, err := config.Load()
 		if err != nil || conf.APIKey == "" {
@@ -34,16 +40,15 @@ This command is only supported on MacOS and Linux using Bash or Zsh. Windows and
 		}
 
 		log.Info("Thinking....")
-
+		log.Debug("Getting shell history...")
 		history, err := shell.GetHistory(100)
 		if err != nil {
-			log.Error("This command is only supported on MacOS and Linux using Bash or Zsh. Windows and other shells coming soon!")
+			log.Warn("This command is only supported on MacOS and Linux using Bash or Zsh. Windows and other shells coming soon!")
 			log.Error(err)
 			os.Exit(1)
 		}
 
-		// fmt.Println("History:", history)
-
+		log.Debug("Asking ChatGPT for a command...")
 		resp, err := ai.CmdQuestion(history, chatPrompt, conf)
 
 		if err != nil {
@@ -59,4 +64,5 @@ func init() {
 	RootCmd.AddCommand(cmdCmd)
 
 	cmdCmd.Flags().StringVarP(&chatPrompt, "question", "q", "", "The prompt to use for the chat session")
+	cmdCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
 }

cmd/commit.go

@@ -11,6 +11,7 @@ import (
 	"github.com/chand1012/ottodocs/pkg/ai"
 	"github.com/chand1012/ottodocs/pkg/config"
 	"github.com/chand1012/ottodocs/pkg/git"
+	l "github.com/charmbracelet/log"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +20,11 @@ var commitCmd = &cobra.Command{
 	Use:   "commit",
 	Short: "Generates a commit message from the git diff",
 	Long:  `Uses the git diff to generate a commit message. Requires Git to be installed on the system.`,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		if verbose {
+			log.SetLevel(l.DebugLevel)
+		}
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		conf, err := config.Load()
 		if err != nil || conf.APIKey == "" {
@@ -29,7 +35,7 @@ var commitCmd = &cobra.Command{
 		}
 
 		log.Info("Generating commit message...")
-
+		log.Debug("Getting git diff...")
 		c := exec.Command("git", "diff")
 		diffBytes, err := c.Output()
 		if err != nil {
@@ -38,7 +44,7 @@ var commitCmd = &cobra.Command{
 		}
 
 		diff := string(diffBytes)
-
+		log.Debug("Sending diff to ChatGPT...")
 		msg, err := ai.CommitMessage(diff, conventional, conf)
 		if err != nil {
 			log.Error(err)
@@ -86,4 +92,5 @@ func init() {
 	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")
+	commitCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
 }

cmd/docs.go

@@ -57,19 +57,22 @@ search for files in the directory and document them. If a single file is specifi
 			os.Exit(1)
 		}
 
+		log.Debug("Loading file info...")
 		info, err := os.Stat(repoPath)
 		if err != nil {
 			log.Errorf("Error getting file info: %s", err)
 			os.Exit(1)
 		}
 
 		if info.IsDir() {
+			log.Debug("Getting repo...")
 			repo, err := git.GetRepo(repoPath, ignoreFilePath, ignoreGitignore)
 			if err != nil {
 				log.Errorf("Error: %s", err)
 				os.Exit(1)
 			}
 
+			log.Debug("Documenting repo...")
 			for _, file := range repo.Files {
 				var contents string
 
@@ -83,6 +86,7 @@ search for files in the directory and document them. If a single file is specifi
 					chatPrompt = "Write documentation for the following code snippet. The file name is" + file.Path + ":"
 				}
 
+				log.Debugf("Loading file %s", path)
 				fileContents, err := utils.LoadFile(path)
 				if err != nil {
 					log.Warnf("Error loading file %s: %s", path, err)

cmd/root.go

@@ -29,13 +29,5 @@ func Execute() {
 }
 
 func init() {
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
-
-	// RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.ottodocs.yaml)")
-
-	// Cobra also supports local flags, which will only run
-	// when this action is called directly.
-	// RootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	// RootCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
 }

cmd/vars.go

@@ -6,6 +6,8 @@ import (
 	l "github.com/charmbracelet/log"
 )
 
+var verbose bool
+
 var repoPath string
 var preambleFile string
 var outputFile string

pkg/ai/question.go

@@ -1,14 +1,29 @@
 package ai
 
 import (
-	"strings"
+	"github.com/chand1012/git2gpt/prompt"
 
+	"github.com/chand1012/ottodocs/pkg/calc"
 	"github.com/chand1012/ottodocs/pkg/config"
 	"github.com/chand1012/ottodocs/pkg/constants"
 )
 
-func Question(filePath, fileContent, chatPrompt string, conf *config.Config) (string, error) {
-	question := "File Name: " + filePath + "\nQuestion: " + chatPrompt + "\n\n" + strings.TrimRight(string(fileContent), " \n") + "\nAnswer:"
+func Question(files []prompt.GitFile, chatPrompt string, conf *config.Config) (string, error) {
+	question := "\nGiven the context of the above code, answer the following question.\nQuestion: " + chatPrompt + "\nAnswer:"
+	t, err := calc.PreciseTokens(question)
+	if err != nil {
+		return "", err
+	}
 
-	return request(constants.QUESTION_PROMPT, question, conf)
+	tokens := int64(t)
+
+	var prompt string
+	for _, file := range files {
+		if file.Tokens+tokens > int64(calc.GetMaxTokens(conf.Model)) {
+			break
+		}
+		prompt += "Filename: " + file.Path + "\n" + file.Contents + "\n"
+	}
+
+	return request(constants.QUESTION_PROMPT, prompt+question, conf)
 }