mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-05-18 06:19:19 +00:00
Fix jinja error on case-insensitive roles and 0-len messages result (#2201)
* fix jinja error on case-insensitive roles and 0-len messages result * check length in correct place
This commit is contained in:
parent
66a7b5e5de
commit
5962bca463
1 changed files with 2 additions and 2 deletions
|
|
@ -3584,9 +3584,9 @@ def format_jinja(messages_orig, tools, chat_template_kwargs=None):
|
|||
last_assist_msg = ""
|
||||
if messages:
|
||||
last_assist_msg = messages[-1]["content"]
|
||||
assist_should_prefill = (messages and messages[-1]["role"] == "assistant" and last_assist_msg and isinstance(last_assist_msg, str) and len(last_assist_msg.strip())>0) #avoid single character newline or space content
|
||||
assist_should_prefill = (messages and messages[-1]["role"].lower() == "assistant" and last_assist_msg and isinstance(last_assist_msg, str) and len(last_assist_msg.strip())>0) #avoid single character newline or space content
|
||||
last_assist_msg = "" if not assist_should_prefill else last_assist_msg
|
||||
messages_for_render = messages[:-1] if assist_should_prefill else messages
|
||||
messages_for_render = messages[:-1] if len(messages) > 1 and assist_should_prefill else messages
|
||||
if tools and len(tools)>0:
|
||||
text = jinja_compiled_template.render(messages=messages_for_render, tools=tools, add_generation_prompt=True, bos_token="", eos_token="", **chat_template_kwargs)
|
||||
else:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue