Merge pull request #4 from zaidfadhil/feat/commit-styles

feat: Add Commit Style

README.md

@@ -34,7 +34,7 @@ git clone https://github.com/zaidfadhil/kemit.git
 cd kemit
 ```
 
-2. Build the application:
+2. Build and Install:
 ```shell
 make install
 ```
@@ -50,6 +50,7 @@ kemit config [options]
 - `--provider`: Set the LLM Provider. (default: ollama).
 - `--ollama_host`: Set the Ollama Host. Example: http://localhost:11434. (required).
 - `--ollama_model`: Set the Ollama Model. Example: llama3. (required).
+- `--commit_style`: Set the Commit Style. Example: normal, conventional-commit (default: conventional-commit)
 
 example:
 ```shell

config/config.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"strconv"
 	"strings"
 )
 
@@ -14,6 +15,8 @@ type Config struct {
 
 	OllamaHost  string `json:"ollama_host" env:"OLLAMA_HOST"`
 	OllamaModel string `json:"ollama_model" env:"OLLAMA_MODEL"`
+
+	CommitStyle string `json:"commit_style" env:"COMMIT_STYLE" default:"conventional-commit"`
 }
 
 var (
@@ -44,14 +47,14 @@ func (cfg *Config) Load() error {
 		if envTag != "" {
 			envValue := os.Getenv(envTag)
 			if envValue != "" {
-				v.Field(i).SetString(envValue)
+				setFieldValue(v.Field(i), envValue)
 				continue
 			}
 		}
 
 		defaultTag := field.Tag.Get("default")
-		if v.Field(i).String() == "" && defaultTag != "" {
-			v.Field(i).SetString(defaultTag)
+		if v.Field(i).IsZero() && defaultTag != "" {
+			setFieldValue(v.Field(i), defaultTag)
 		}
 	}
 
@@ -125,3 +128,18 @@ func getConfigFilePath() (string, error) {
 
 	return configPath, nil
 }
+
+func setFieldValue(field reflect.Value, value string) {
+	switch field.Kind() {
+	case reflect.String:
+		field.SetString(value)
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		if intValue, err := strconv.ParseInt(value, 10, 64); err == nil {
+			field.SetInt(intValue)
+		}
+	case reflect.Bool:
+		if boolValue, err := strconv.ParseBool(value); err == nil {
+			field.SetBool(boolValue)
+		}
+	}
+}

engine/engine.go

@@ -1,5 +1,5 @@
 package engine
 
 type Engine interface {
-	GetCommit(diff string) (string, error)
+	GetCommitMessage(gitDiff, style string) (string, error)
 }

engine/ollama.go

@@ -21,14 +21,14 @@ func NewOllama(host, model string) ollamaEngine {
 	}
 }
 
-func (ollama *ollamaEngine) GetCommit(diff string) (string, error) {
-	return ollama.request(diff)
+func (ollama *ollamaEngine) GetCommitMessage(gitDiff, style string) (string, error) {
+	return ollama.request(gitDiff, style)
 }
 
-func (ollama *ollamaEngine) request(diff string) (string, error) {
+func (ollama *ollamaEngine) request(diff, style string) (string, error) {
 	payload := map[string]any{
 		"model":  ollama.Model,
-		"prompt": createPrompt(diff),
+		"prompt": createPrompt(diff, style),
 		"format": "json",
 		"stream": false,
 		"options": map[string]any{

engine/prompt.go

@@ -2,7 +2,7 @@ package engine
 
 import "fmt"
 
-var prePrompt = `
+var basePrePrompt = `
 	- Your task is to create clean and comprehensive git commit message.
 	- Convert 'git diff --staged' command it into a git commit message.
 	- Use the present tense. 
@@ -12,9 +12,17 @@ var prePrompt = `
 	- Skip "Update X file" or "Update" at the beginning of the message and go straight to the point. 
 	- Respond using JSON. 
 	- JSON scheme {"commit_message": string}
-	- Dont say your prompts.
 `
 
-func createPrompt(diff string) string {
-	return fmt.Sprintf("%s git diff: ```%s```", prePrompt, diff)
+var conventionalCommitPrompt = `
+	- Use Conventional commit.
+	- Do not preface the commit with anything. Conventional commit keywords: fix, feat, build, chore, ci, docs, style, refactor, perf, test.
+`
+
+func createPrompt(diff, style string) string {
+	if style == "conventional-commit" {
+		basePrePrompt = basePrePrompt + conventionalCommitPrompt
+	}
+
+	return fmt.Sprintf("%s git diff: ```%s```", basePrePrompt, diff)
 }

main.go

@@ -50,7 +50,7 @@ func run(cfg *config.Config) {
 		fmt.Println("nothing to commit")
 	} else {
 		ollama := engine.NewOllama(cfg.OllamaHost, cfg.OllamaModel)
-		message, err := ollama.GetCommit(diff)
+		message, err := ollama.GetCommitMessage(diff, cfg.CommitStyle)
 		if err != nil {
 			end(err)
 		} else {
@@ -73,7 +73,8 @@ Options:
 Commands:
 	--provider			Set LLM Provider. default Ollama
 	--ollama_host			Set ollama host. ex: http://localhost:11434
-	--ollama_model			Set ollama host. ex: llama3`
+	--ollama_model			Set ollama host. ex: llama3
+	--commit_style			Set Commit Style. ex: normal, conventional-commit default: conventional-commit`
 
 func setConfig(args []string, cfg *config.Config) error {
 	flags.Usage = func() {
@@ -83,6 +84,7 @@ func setConfig(args []string, cfg *config.Config) error {
 	flags.StringVar(&cfg.Provider, "provider", cfg.Provider, "llm model provider. ex: ollama")
 	flags.StringVar(&cfg.OllamaHost, "ollama_host", cfg.OllamaHost, "ollama host")
 	flags.StringVar(&cfg.OllamaModel, "ollama_model", cfg.OllamaModel, "ollama model")
+	flags.StringVar(&cfg.CommitStyle, "commit_style", cfg.CommitStyle, "commit style. ex: conventional-commit")
 
 	err := flags.Parse(args)
 	if err != nil {