feat(conf): remove -GGUF in -hf model name

Author: 0uep

conf/write.go

@@ -12,6 +12,7 @@ import (
 	"math"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 
 	"github.com/LM4eu/goinfer/gie"
@@ -257,9 +258,9 @@ func (cfg *Cfg) setSwapModels() {
 }
 
 // Add the model settings within the llama-swap configuration.
-func (cfg *Cfg) addModelCfg(modelName, cmd string, mc *config.ModelConfig) {
+func (cfg *Cfg) addModelCfg(model, cmd string, mc *config.ModelConfig) {
 	mCfg := *mc // copy
-	mCfg.Cmd = cmd
+	mCfg.Cmd = strings.TrimSpace(cmd)
 
 	mCfg.CheckEndpoint = "/health"
 	if strings.Contains(cmd, " -hf ") {
@@ -269,13 +270,21 @@ func (cfg *Cfg) addModelCfg(modelName, cmd string, mc *config.ModelConfig) {
 		mCfg.CheckEndpoint = "none"
 	}
 
-	old, ok := cfg.Swap.Models[modelName]
+	model = strings.Replace(model, "-GGUF", "", 1)
+
+	old, ok := cfg.Swap.Models[model]
 	if ok {
-		slog.Debug("Overwrite config", "old", old)
-		slog.Debug("Overwrite config", "new", modelName)
+		if old.Cmd != "" && old.Cmd != mCfg.Cmd {
+			mCfg.Cmd += " " + old.Cmd
+			slog.Info("Merge", "model", model, "old", old)
+			slog.Info("Merge", "model", model, "new", mCfg)
+		} else if !reflect.DeepEqual(old.Cmd, mCfg.Cmd) {
+			slog.Info("Overwrite", "model", model, "old", old)
+			slog.Info("Overwrite", "model", model, "new", mCfg)
+		}
 	}
 
-	cfg.Swap.Models[modelName] = mCfg
+	cfg.Swap.Models[model] = mCfg
 }
 
 func (cfg *Cfg) setAPIKey(debug, noAPIKey bool) {