fixed adv mode

This commit is contained in:
Concedo 2025-08-08 22:26:36 +08:00
parent 866cc346ab
commit 3468c2834d
4 changed files with 10 additions and 5 deletions

View file

@ -4,5 +4,5 @@
"user_start": "<|start|>user<|message|>", "user_start": "<|start|>user<|message|>",
"user_end": "<|end|>", "user_end": "<|end|>",
"assistant_start": "<|start|>assistant<|channel|>final<|message|>", "assistant_start": "<|start|>assistant<|channel|>final<|message|>",
"assistant_end": "<|return|>" "assistant_end": "<|end|>"
} }

View file

@ -12,7 +12,7 @@ Current version indicated by LITEVER below.
--> -->
<script id="init-config"> <script id="init-config">
const LITEVER = 268; const LITEVER = 269;
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
var localflag = urlParams.get('local'); //this will be replaced automatically in embedded kcpp var localflag = urlParams.get('local'); //this will be replaced automatically in embedded kcpp
const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_"; const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_";
@ -3633,7 +3633,7 @@ Current version indicated by LITEVER below.
"user":"<|start|>user<|message|>", "user":"<|start|>user<|message|>",
"user_end":"<|end|>", "user_end":"<|end|>",
"assistant":"<|start|>assistant<|channel|>final<|message|>", "assistant":"<|start|>assistant<|channel|>final<|message|>",
"assistant_end":"<|return|>", "assistant_end":"<|end|>",
"system":"<|start|>developer<|message|>", "system":"<|start|>developer<|message|>",
"system_end":"<|end|>", "system_end":"<|end|>",
} }
@ -15975,12 +15975,12 @@ Current version indicated by LITEVER below.
newgen = "\n\n\> " + newgen + diceaddon + "\n\n"; newgen = "\n\n\> " + newgen + diceaddon + "\n\n";
} }
//if very first submission is a story in adventure mode, swap to action //if very first submission is a story in adventure mode, swap to action
if(localsettings.opmode == 2 && newgen != "" && gametext_arr.length==0) if(localsettings.opmode == 2 && (gametext_arr.length==0 || (gametext_arr.length==1 && gametext_arr[0]=="")))
{ {
if(localsettings.adventure_switch_mode==0) if(localsettings.adventure_switch_mode==0)
{ {
localsettings.adventure_switch_mode = 1; localsettings.adventure_switch_mode = 1;
if (current_memory.trim() == "") if (current_memory.trim() == "" && newgen!="")
{ {
doNotGenerate = true; doNotGenerate = true;
} }

View file

@ -356,6 +356,10 @@ void print_tok_vec(std::vector<float> &embd)
{ {
fileformatmeta->model_architecture = GGUFArch::ARCH_GLM4; fileformatmeta->model_architecture = GGUFArch::ARCH_GLM4;
} }
else if(modelarch=="gpt-oss")
{
fileformatmeta->model_architecture = GGUFArch::ARCH_GPTOSS;
}
printf("Arch Category: %d\n",fileformatmeta->model_architecture); printf("Arch Category: %d\n",fileformatmeta->model_architecture);
} }

View file

@ -64,6 +64,7 @@ enum GGUFArch
ARCH_GLM4 = 9, ARCH_GLM4 = 9,
ARCH_GEMMA3N = 10, ARCH_GEMMA3N = 10,
ARCH_JAMBA = 11, ARCH_JAMBA = 11,
ARCH_GPTOSS = 12,
}; };
struct FileFormatExtraMeta struct FileFormatExtraMeta