Add new models, summarize commit messages

Author: chand1012

cmd/commit.go

@@ -12,6 +12,7 @@ import (
 	"github.com/chand1012/ottodocs/pkg/ai"
 	"github.com/chand1012/ottodocs/pkg/calc"
 	"github.com/chand1012/ottodocs/pkg/config"
+	"github.com/chand1012/ottodocs/pkg/constants"
 	"github.com/chand1012/ottodocs/pkg/git"
 	"github.com/chand1012/ottodocs/pkg/utils"
 	l "github.com/charmbracelet/log"
@@ -158,16 +159,17 @@ var commitCmd = &cobra.Command{
 		}
 
 		if len(msg) > 75 {
-			// truncate to the first period or the first newline
-			newMsg := msg
-			if strings.Contains(msg, "\n") {
-				newMsg = strings.Split(msg, "\n")[0]
-			} else if strings.Contains(msg, ".") {
-				newMsg = strings.Split(msg, ".")[0]
+			// summarize the message
+			stream, err := ai.SimpleStreamRequest(constants.SUMMARIZE_PROMPT+msg, conf)
+			if err != nil {
+				log.Errorf("Error summarizing commit message: %s", err)
+				os.Exit(1)
 			}
-			if len(newMsg) != len(msg) {
-				utils.PrintColoredTextLn("Truncated commit message: "+newMsg, conf.OttoColor)
-				msg = newMsg
+			utils.PrintColoredText("Summarized Commit Msg: ", conf.OttoColor)
+			msg, err = utils.PrintChatCompletionStream(stream)
+			if err != nil {
+				log.Errorf("Error printing chat completion stream: %s", err)
+				os.Exit(1)
 			}
 		}
 

cmd/config.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var VALID_MODELS = []string{"gpt-4", "gpt-4-0314", "gpt-4-32k", "gpt-4-32k-0314", "gpt-3.5-turbo", "gpt-3.5-turbo-0301"}
+var VALID_MODELS = []string{"gpt-4", "gpt-4-0314", "gpt-4-32k", "gpt-4-32k-0314", "gpt-3.5-turbo", "gpt-3.5-turbo-0301", "gpt-3.5-turbo-16k", "gpt-3.5-turbo-0613"}
 
 // configCmd represents the config command
 var configCmd = &cobra.Command{
@@ -21,7 +21,7 @@ var configCmd = &cobra.Command{
 	Long: `Configures ottodocs. Allows user to specify OpenAI API Key, GitHub Token, and the model with a single command.
 
 Default model is gpt-3.5-turbo.
-Valid models are: gpt-4, gpt-4-0314, gpt-4-32k, gpt-4-32k-0314, gpt-3.5-turbo, gpt-3.5-turbo-0301
+Valid models are: gpt-4, gpt-4-0314, gpt-4-32k, gpt-4-32k-0314, gpt-3.5-turbo, gpt-3.5-turbo-0301, gpt-3.5-turbo-16k, gpt-3.5-turbo-0613
 See here for more information on the Models available: https://platform.openai.com/docs/models/model-endpoint-compatibility	
 
 GitHub Tokens need access to the repo scope.
@@ -103,4 +103,4 @@ func init() {
 	configCmd.Flags().StringVarP(&userColor, "userColor", "u", "", "User color for configuration")
 	// set otto color
 	configCmd.Flags().StringVarP(&ottoColor, "ottoColor", "o", "", "Otto color for configuration")
-}
+}

pkg/calc/tokens.go

@@ -36,6 +36,9 @@ func EstimateTokens(inputs ...string) int {
 }
 
 func GetMaxTokens(model string) int {
+	if strings.Contains(model, "16k") {
+		return 16384
+	}
 	if strings.Contains(model, "32k") {
 		return 32768
 	}

pkg/constants/prompts.go

@@ -30,9 +30,9 @@ var COMMAND_QUESTION_PROMPT string = `You are a helpful assistant who answers qu
 - If there is no way to answer the question, you should say so.
 - The answer must be AT LEAST one sentence long.`
 
-var GIT_DIFF_PROMPT_STD string = `You are a helpful assistant who writes git commit messages. You will be given a Git diff and you should use it to create a commit message. The commit message should be no longer than 75 characters long and should describe the changes in the diff. The changes should be in the present tense and should be concise. Do not include the file names in the commit message.`
+var GIT_DIFF_PROMPT_STD string = `You are a helpful assistant who writes git commit messages. You will be given a Git diff and you should use it to create a commit message. The commit message should be no longer than 75 characters long and should describe the changes in the diff. The changes should be in the present tense and should be concise. Do not include the file names in the commit message. The commit message should not exceed 75 characters.`
 
-var GIT_DIFF_PROMPT_CONVENTIONAL string = `You are a helpful assistant who writes git commit messages. You will be given a Git diff and you should use it to create a commit message. The commit message should be no longer than 75 characters long and should describe the changes in the diff. Do not include the file names in the commit message. The commit message should follow the conventional commit format.`
+var GIT_DIFF_PROMPT_CONVENTIONAL string = `You are a helpful assistant who writes git commit messages. You will be given a Git diff and you should use it to create a commit message. The commit message should be no longer than 75 characters long and should describe the changes in the diff. Do not include the file names in the commit message. The commit message should not exceed 75 characters. The commit message should follow the conventional commit format.`
 
 var PR_TITLE_PROMPT string = "You are a helpful assistant who writes pull request titles. You will be given information related to the pull request and you should use it to create a pull request title. The title should be no longer than 75 characters long and should describe the changes in the pull request. Do not include the file names in the title."
 
@@ -50,3 +50,4 @@ var RELEASE_PROMPT string = `You are a helpful assistant who creates GitHub rele
 
 Commit log:
 `
+var SUMMARIZE_PROMPT string = "You are a helpful assistant who summarizes text. Summarize the following into a single line with at most 75 characters:\n"