feat(config): allow custom ollama path (#171)

Author: Camsbury

config/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"time"
 
 	"github.com/fsnotify/fsnotify"
@@ -15,6 +16,7 @@ type Config struct {
 	Columns           []string `mapstructure:"columns"`
 	OllamaAPIKey      string   `mapstructure:"ollama_api_key"`
 	OllamaAPIURL      string   `mapstructure:"ollama_api_url"`
+	OllamaModelsDir   string   `mapstructure:"ollama_models_dir"`
 	LMStudioFilePaths string   `mapstructure:"lm_studio_file_paths"`
 	LogLevel          string   `mapstructure:"log_level"`
 	LogFilePath       string   `mapstructure:"log_file_path"`
@@ -29,6 +31,7 @@ var defaultConfig = Config{
 	Columns:           []string{"Name", "Size", "Quant", "Family", "Modified", "ID"},
 	OllamaAPIKey:      "",
 	OllamaAPIURL:      getAPIUrl(),
+	OllamaModelsDir:   GetOllamaModelDir(),
 	LMStudioFilePaths: "",
 	LogLevel:          "info",
 	SortOrder:         "modified",
@@ -37,6 +40,18 @@ var defaultConfig = Config{
 	DockerContainer:   "",
 }
 
+// GetOllamaModelDir returns the default Ollama models directory for the current OS
+func GetOllamaModelDir() string {
+	homeDir := utils.GetHomeDir()
+	if runtime.GOOS == "darwin" {
+		return filepath.Join(homeDir, ".ollama", "models")
+	} else if runtime.GOOS == "linux" {
+		return "/usr/share/ollama/models"
+	}
+	// Add Windows path if needed
+	return filepath.Join(homeDir, ".ollama", "models")
+}
+
 // getAPIUrl determines the API URL based on environment variables.
 func getAPIUrl() string {
 	if apiUrl := os.Getenv("OLLAMA_API_URL"); apiUrl != "" {
@@ -108,6 +123,7 @@ func LoadConfig() (Config, error) {
 	viper.SetDefault("columns", defaultConfig.Columns)
 	viper.SetDefault("ollama_api_key", defaultConfig.OllamaAPIKey)
 	viper.SetDefault("ollama_api_url", defaultConfig.OllamaAPIURL)
+	viper.SetDefault("ollama_models_dir", defaultConfig.OllamaModelsDir)
 	viper.SetDefault("lm_studio_file_paths", defaultConfig.LMStudioFilePaths)
 	viper.SetDefault("log_level", defaultConfig.LogLevel)
 	viper.SetDefault("log_file_path", defaultConfig.LogFilePath)
@@ -119,6 +135,7 @@ func LoadConfig() (Config, error) {
 	config.Columns = viper.GetStringSlice("columns")
 	config.OllamaAPIKey = viper.GetString("ollama_api_key")
 	config.OllamaAPIURL = viper.GetString("ollama_api_url")
+	config.OllamaModelsDir = viper.GetString("ollama_models_dir")
 	config.LMStudioFilePaths = viper.GetString("lm_studio_file_paths")
 	config.LogLevel = viper.GetString("log_level")
 	config.LogFilePath = viper.GetString("log_file_path")

config/config_test.go

@@ -61,6 +61,7 @@ func TestLoadConfig(t *testing.T) {
 					Columns:           []string{"Name", "Size"},
 					OllamaAPIKey:      "testkey",
 					OllamaAPIURL:      "http://testurl",
+					OllamaModelsDir:   GetOllamaModelDir(),
 					LMStudioFilePaths: "/test/path",
 					LogLevel:          "debug",
 					LogFilePath:       "/test/path/gollama.log",
@@ -75,6 +76,7 @@ func TestLoadConfig(t *testing.T) {
 				Columns:           []string{"Name", "Size"},
 				OllamaAPIKey:      "testkey",
 				OllamaAPIURL:      "http://testurl",
+				OllamaModelsDir:   GetOllamaModelDir(),
 				LMStudioFilePaths: "/test/path",
 				LogLevel:          "debug",
 				LogFilePath:       "/test/path/gollama.log",
@@ -97,6 +99,7 @@ func TestLoadConfig(t *testing.T) {
 				Columns:           []string{"Name", "Size", "Quant", "Family", "Modified", "ID"},
 				OllamaAPIKey:      "",
 				OllamaAPIURL:      "http://127.0.0.1:11434", // Default URL when no env vars are set
+				OllamaModelsDir:   GetOllamaModelDir(),
 				LMStudioFilePaths: "",
 				LogLevel:          "info",
 				SortOrder:         "modified",
@@ -119,6 +122,7 @@ func TestLoadConfig(t *testing.T) {
 				OllamaAPIKey:      "",
 				OllamaAPIURL:      "http://ollama.icu.lol",
 				LMStudioFilePaths: "",
+				OllamaModelsDir:   GetOllamaModelDir(),
 				LogLevel:          "info",
 				SortOrder:         "modified",
 				StripString:       "",

lmstudio/link.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"text/template"
 
@@ -114,18 +113,6 @@ func ScanModels(dirPath string) ([]Model, error) {
 	return models, nil
 }
 
-// GetOllamaModelDir returns the default Ollama models directory for the current OS
-func GetOllamaModelDir() string {
-	homeDir := utils.GetHomeDir()
-	if runtime.GOOS == "darwin" {
-		return filepath.Join(homeDir, ".ollama", "models")
-	} else if runtime.GOOS == "linux" {
-		return "/usr/share/ollama/models"
-	}
-	// Add Windows path if needed
-	return filepath.Join(homeDir, ".ollama", "models")
-}
-
 // modelExists checks if a model is already registered with Ollama
 func modelExists(modelName string) bool {
 	cmd := exec.Command("ollama", "list")
@@ -181,14 +168,12 @@ func createModelfile(modelName string, modelPath string) error {
 
 // LinkModelToOllama links an LM Studio model to Ollama
 // If dryRun is true, it will only print what would happen without making any changes
-func LinkModelToOllama(model Model, dryRun bool, ollamaHost string) error {
+func LinkModelToOllama(model Model, dryRun bool, ollamaHost string, ollamaDir string) error {
 	// Check if we're connecting to a local Ollama instance
 	if !utils.IsLocalhost(ollamaHost) {
 		return fmt.Errorf("linking LM Studio models to Ollama is only supported when connecting to a local Ollama instance (got %s)", ollamaHost)
 	}
 
-	ollamaDir := GetOllamaModelDir()
-
 	if dryRun {
 		logging.InfoLogger.Printf("[DRY RUN] Would create Ollama models directory at: %s", ollamaDir)
 	} else if err := os.MkdirAll(ollamaDir, 0755); err != nil {

main.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"path/filepath"
 	"sort"
 	"strings"
 
@@ -25,7 +24,6 @@ import (
 	"github.com/sammcj/gollama/config"
 	"github.com/sammcj/gollama/lmstudio"
 	"github.com/sammcj/gollama/logging"
-	"github.com/sammcj/gollama/utils"
 	"github.com/sammcj/gollama/vramestimator"
 )
 
@@ -314,7 +312,7 @@ func main() {
 	}
 
 	if *ollamaDirFlag == "" {
-		app.ollamaModelsDir = filepath.Join(utils.GetHomeDir(), ".ollama", "models")
+		app.ollamaModelsDir = cfg.OllamaModelsDir
 	}
 	if *lmStudioDirFlag == "" {
 		app.lmStudioModelsDir = cfg.LMStudioFilePaths
@@ -394,7 +392,7 @@ func main() {
 
 		for _, model := range models {
 			fmt.Printf("%sProcessing model %s... ", prefix, model.Name)
-			if err := lmstudio.LinkModelToOllama(model, *dryRunFlag, cfg.OllamaAPIURL); err != nil {
+			if err := lmstudio.LinkModelToOllama(model, *dryRunFlag, cfg.OllamaAPIURL, app.ollamaModelsDir); err != nil {
 				logging.ErrorLogger.Printf("Error linking model %s: %v\n", model.Name, err)
 				fmt.Printf("failed: %v\n", err)
 				failCount++