feat(conf): remove surrounding single-quotes in llama.ini params

Author: 0uep

conf/llamacppini.go

@@ -37,7 +37,6 @@ func (cfg *Cfg) GenLlamaINI() []byte {
 	out := bytes.NewBufferString(`
 version = 1
 `)
-
 	// For each model, set two model settings:
 	// 1. for the OpenAI endpoints
 	// 2. for the /completion endpoint (prefix with A_ and hide the model)
@@ -61,10 +60,8 @@ model = ` + path)
 	wroteKey := false
 
 	for arg := range strings.FieldsSeq(flags) {
-		arg = strings.TrimSpace(arg)
-		if arg != "" {
-			wroteKey = genParam(out, arg, wroteKey)
-		}
+		arg = strings.Trim(arg, "'")
+		wroteKey = genParam(out, arg, wroteKey)
 	}
 
 	if wroteKey {
@@ -76,7 +73,7 @@ model = ` + path)
 
 // Add the model settings within the llama-swap configuration.
 func genParam(out *bytes.Buffer, arg string, wroteKey bool) bool {
-	if arg[0] != '-' {
+	if arg == "" || arg[0] != '-' {
 		out.WriteByte(' ')
 		out.WriteString(arg)
 		return false

conf/llamacppini_test.go

@@ -16,35 +16,53 @@ func TestCfg_GenLlamaINI(t *testing.T) {
 		info *ModelInfo
 		want string
 	}{
-		{"model-with-flags", &ModelInfo{Flags: "  -c   0   --n-gpu-layers 99  --no-jinja 	--context-switch  "}, `
+		{"flags", &ModelInfo{Flags: "  -c   0   --n-gpu-layers 99  --no-jinja 	--context-switch  "}, `
 version = 1
 
-[model-with-flags]
-model = /path/model-with-flags.gguf
+[flags]
+model = /path/flags.gguf
 c = 0
 n-gpu-layers = 99
 no-jinja = true
 context-switch = true
 
-[model-with-flags` + PLUS_A + `]
-model = /path/model-with-flags.gguf
+[flags` + PLUS_A + `]
+model = /path/flags.gguf
 jinja = true
 chat-template-file = template.jinja
 c = 0
 n-gpu-layers = 99
 no-jinja = true
 context-switch = true
 `},
-		{"model-no-flags", &ModelInfo{Flags: ""}, `
+		{"no-flags", &ModelInfo{Flags: ""}, `
 version = 1
 
-[model-no-flags]
-model = /path/model-no-flags.gguf
+[no-flags]
+model = /path/no-flags.gguf
 
-[model-no-flags` + PLUS_A + `]
-model = /path/model-no-flags.gguf
+[no-flags` + PLUS_A + `]
+model = /path/no-flags.gguf
 jinja = true
 chat-template-file = template.jinja
+`},
+		{"quote", &ModelInfo{Flags: `
+		--chat-template-kwargs '{"reasoning_effort": "high"}' 
+		-ot "blk\.1.\.ffn_.*=CPU"
+		`}, `
+version = 1
+
+[quote]
+model = /path/quote.gguf
+chat-template-kwargs = {"reasoning_effort": "high"}
+ot = "blk\.1.\.ffn_.*=CPU"
+
+[quote` + PLUS_A + `]
+model = /path/quote.gguf
+jinja = true
+chat-template-file = template.jinja
+chat-template-kwargs = {"reasoning_effort": "high"}
+ot = "blk\.1.\.ffn_.*=CPU"
 `},
 	}
 	for _, tt := range tests {