From d1c0154d664e51d1ee6ea82d9c0e799d96367d4a Mon Sep 17 00:00:00 2001
From: oobabooga <112222186+oobabooga@users.noreply.github.com>
Date: Tue, 6 May 2025 06:38:39 -0700
Subject: [PATCH] llama.cpp: Add top_n_sigma, fix typical_p in sampler priority

---
 modules/llama_cpp_server.py | 5 ++++-
 modules/presets.py          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/llama_cpp_server.py b/modules/llama_cpp_server.py
index 0ddb3fff..b9902cd7 100644
--- a/modules/llama_cpp_server.py
+++ b/modules/llama_cpp_server.py
@@ -66,6 +66,7 @@ class LlamaServer:
             "top_k": state["top_k"],
             "top_p": state["top_p"],
             "min_p": state["min_p"],
+            "top_n_sigma": state["top_n_sigma"] if state["top_n_sigma"] > 0 else -1,
             "tfs_z": state["tfs"],
             "typical_p": state["typical_p"],
             "repeat_penalty": state["repetition_penalty"],
@@ -102,8 +103,10 @@ class LlamaServer:
 
             penalty_found = False
             for s in samplers:
-                if s.strip() in ["dry", "top_k", "typ_p", "top_p", "min_p", "xtc", "temperature"]:
+                if s.strip() in ["dry", "top_k", "top_p", "top_n_sigma", "min_p", "temperature", "xtc"]:
                     filtered_samplers.append(s.strip())
+                elif s.strip() == "typical_p":
+                    filtered_samplers.append("typ_p")
                 elif not penalty_found and s.strip() == "repetition_penalty":
                     filtered_samplers.append("penalties")
                     penalty_found = True
diff --git a/modules/presets.py b/modules/presets.py
index 50d0f985..5a9a5873 100644
--- a/modules/presets.py
+++ b/modules/presets.py
@@ -52,7 +52,7 @@ def default_preset():
 
     if shared.args.portable:
         samplers = result['sampler_priority'].split('\n')
-        samplers = [sampler for sampler in samplers if sampler in ["dry", "top_k", "typ_p", "top_p", "min_p", "xtc", "temperature", "repetition_penalty"]]
+        samplers = [sampler for sampler in samplers if sampler in ["dry", "top_k", "top_p", "top_n_sigma", "min_p", "temperature", "xtc", "typical_p", "repetition_penalty"]]
         result['sampler_priority'] = '\n'.join(samplers)
 
     return result