"Update llm package to use HTTP provider and add support for Ollama, OpenAI, and custom providers"

Author: manyfacedqod

cmd/generate.go

@@ -2,124 +2,52 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 	"os/exec"
+	"strings"
+
+	"github.com/spf13/cobra"
+
 	"smartcommit/config"
 	"smartcommit/diff"
 	"smartcommit/llm"
-	"smartcommit/prompt"
-	"time"
-
-	promptui "github.com/manifoldco/promptui"
-	"github.com/spf13/cobra"
 )
 
-var yesFlag bool
-
-var GenerateCmd = &cobra.Command{
-	Use:   "generate",
-	Short: "Generate a commit message using AI",
-	Long: `Generate a commit message from staged Git changes using a local or remote LLM.
-
-By default, it launches an interactive flow.
-Use --yes or -y to skip the prompt and commit directly.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		cfg := config.LoadOrDefault()
-
-		diffText, err := diff.GetStagedDiff()
-		if err != nil || len(diffText) == 0 {
-			fmt.Println("❌ No staged changes found.")
-			return
-		}
-
-		promptText := prompt.Build(diffText, cfg.SystemPrompt)
-
-		provider, err := llm.GetProvider(cfg)
-		if err != nil {
-			fmt.Println("❌", err)
-			return
-		}
-
-		message, err := provider.Generate(promptText)
-		if err != nil {
-			fmt.Println("❌ Generation failed:", err)
-			return
-		}
-
-		if yesFlag {
-			fmt.Println("💡 Generated Commit Message:")
-			fmt.Println("----------------------------------")
-			fmt.Println(message)
-			fmt.Println("----------------------------------")
-			runGitCommit(message)
-			return
-		}
-
-		for {
-			fmt.Println("\n💡 Generated Commit Message:")
-			fmt.Println("----------------------------------")
-			fmt.Println(message)
-			fmt.Println("----------------------------------")
-			fmt.Print("Choose [c]ommit, [e]dit message, [r]egenerate, [q]uit: ")
-
-			var choice string
-			fmt.Scanln(&choice)
-
-			switch choice {
-			case "c":
-				runGitCommit(message)
-				return
-			case "e":
-				message = editMessage(message)
-			case "r":
-				fmt.Print("\n🔄 Regenerating")
-				for i := 0; i < 3; i++ {
-					fmt.Print(".")
-					time.Sleep(200 * time.Millisecond)
-				}
-				message, err = provider.Generate(promptText)
-				if err != nil {
-					fmt.Println("❌ Regeneration failed:", err)
-					continue
-				}
-			case "q":
-				return
-			default:
-				fmt.Println("❓ Invalid choice.")
-			}
-		}
-	},
+var generateCmd = &cobra.Command{
+    Use:   "generate",
+    Short: "Generate & commit a message from your diff",
+    Run: func(cmd *cobra.Command, args []string) {
+        cfg := config.LoadOrDefault()
+
+        d, err := diff.GetStagedDiff()
+        if err != nil || d == "" {
+            fmt.Println("❌ No staged changes.")
+            return
+        }
+
+        provider, err := llm.GetProvider(cfg)
+        if err != nil {
+            fmt.Println("❌", err)
+            return
+        }
+
+        prompt := cfg.SystemPrompt + "\n\nDiff:\n" + d
+        msg, err := provider.Generate(prompt)
+        if err != nil {
+            fmt.Println("❌ Generation failed:", err)
+            return
+        }
+        msg = strings.TrimSpace(msg)
+
+        fmt.Println("\n💡 Commit message:\n\n", msg, "\n")
+        git := exec.Command("git", "commit", "-m", msg)
+        git.Stdout = cmd.OutOrStdout()
+        git.Stderr = cmd.OutOrStderr()
+        if err := git.Run(); err != nil {
+            fmt.Println("❌ Git commit failed:", err)
+        }
+    },
 }
 
 func init() {
-	GenerateCmd.Flags().BoolVarP(&yesFlag, "yes", "y", false, "Autogenerate and commit without prompting")
-}
-
-func runGitCommit(msg string) {
-	fmt.Println("✅ Committing with:")
-	fmt.Println(msg)
-	_ = os.WriteFile(".git/COMMIT_EDITMSG", []byte(msg), 0644)
-	_ = executeCommand("git", "commit", "-F", ".git/COMMIT_EDITMSG")
-}
-
-func executeCommand(name string, args ...string) error {
-	c := exec.Command(name, args...)
-	c.Stdin = os.Stdin
-	c.Stdout = os.Stdout
-	c.Stderr = os.Stderr
-	return c.Run()
-}
-
-func editMessage(current string) string {
-	prompt := promptui.Prompt{
-		Label:     "Edit Commit Message",
-		Default:   current,
-		AllowEdit: true,
-	}
-	result, err := prompt.Run()
-	if err != nil {
-		fmt.Println("⚠️ Edit cancelled.")
-		return current
-	}
-	return result
+    rootCmd.AddCommand(generateCmd)
 }

cmd/root.go

@@ -0,0 +1,29 @@
+package cmd
+
+import "github.com/spf13/cobra"
+
+var rootCmd = &cobra.Command{
+    Use:   "smartcommit",
+    Short: "AI‑powered Git commit message generator",
+    Long: `
+SmartCommit reads your staged Git diff and uses any LLM (local or HTTP API) 
+to generate a meaningful commit message, then commits it for you.
+
+Examples:
+  # Configure your LLM provider and API key:
+  smartcommit setup
+
+  # Generate & commit a message:
+  smartcommit generate
+
+If you ever need assistance, run:
+  smartcommit --help
+or see:
+  https://github.com/your‑repo/smartcommit#readme
+`,
+}
+
+
+func Execute() error {
+    return rootCmd.Execute()
+}

cmd/setup.go

@@ -0,0 +1,99 @@
+// File: cmd/setup.go
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/manifoldco/promptui"
+	"github.com/spf13/cobra"
+
+	"smartcommit/config"
+)
+
+var setupCmd = &cobra.Command{
+	Use:   "setup",
+	Short: "Configure LLM provider and settings",
+	Long: `Interactive setup for SmartCommit.
+
+This will prompt you to configure:
+  • Provider (ollama or http)
+  • Model name (e.g. llama3, gpt-3.5-turbo, gemini)
+  • API Key (for HTTP-based providers)
+  • Base URL (your LLM endpoint)
+
+Need help? Run 'smartcommit --help' or see:
+https://github.com/your-repo/smartcommit#readme`,
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("🔧 SmartCommit Setup — press Ctrl+C to abort, or run 'smartcommit --help' for guidance.")
+
+		cfg := config.LoadOrDefault()
+
+		// 1) Provider selection
+		providers := []string{"ollama", "http"}
+		defaultIdx := 0
+		for i, p := range providers {
+			if p == cfg.Provider {
+				defaultIdx = i
+				break
+			}
+		}
+		providerSelect := promptui.Select{
+			Label:     "Choose LLM provider",
+			Items:     providers,
+			CursorPos: defaultIdx,
+			Stdout:    os.Stdout,
+		}
+		_, provider, err := providerSelect.Run()
+		if err != nil {
+			fmt.Println("Setup aborted.")
+			os.Exit(1)
+		}
+		cfg.Provider = provider
+
+		// 2) Model name
+		modelPrompt := promptui.Prompt{
+			Label:   "Model name",
+			Default: cfg.Model,
+			Stdout:  os.Stdout,
+		}
+		if result, err := modelPrompt.Run(); err == nil {
+			cfg.Model = result
+		}
+
+		// 3) API Key (only for http)
+		if cfg.Provider == "http" {
+			keyPrompt := promptui.Prompt{
+				Label:   "API Key (for HTTP, leave blank to skip)",
+				Default: cfg.APIKey,
+				Mask:    '*',
+				Stdout:  os.Stdout,
+			}
+			if result, err := keyPrompt.Run(); err == nil {
+				cfg.APIKey = result
+			}
+		}
+
+		// 4) Base URL
+		urlPrompt := promptui.Prompt{
+			Label:   "Base URL",
+			Default: cfg.BaseURL,
+			Stdout:  os.Stdout,
+		}
+		if result, err := urlPrompt.Run(); err == nil {
+			cfg.BaseURL = result
+		}
+
+		// 5) Save configuration
+		if err := config.Save(cfg); err != nil {
+			fmt.Println("❌ Failed to save config:", err)
+			os.Exit(1)
+		}
+
+		fmt.Println("✅ Configuration saved.")
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(setupCmd)
+}