phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-26 11:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9261 from briandevvn/fix_ollama_pt

Browse source 
Fix "system" role has become unacceptable in ollama
This commit is contained in:
Krish Dholakia 2025-03-14 20:13:28 -07:00 • committed by GitHub
commit 59fd58643b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
litellm/litellm_core_utils/prompt_templates/factory.py
View file

@ -219,6 +219,31 @@ def ollama_pt(
if user_content_str: if user_content_str:
prompt += f"### User:\n{user_content_str}\n\n" prompt += f"### User:\n{user_content_str}\n\n"
system_content_str = ""
## MERGE CONSECUTIVE SYSTEM CONTENT ##
while (
msg_i < len(messages) and messages[msg_i]["role"] == "system"
):
msg_content = messages[msg_i].get("content")
if msg_content:
if isinstance(msg_content, list):
for m in msg_content:
if m.get("type", "") == "image_url":
if isinstance(m["image_url"], str):
images.append(m["image_url"])
elif isinstance(m["image_url"], dict):
images.append(m["image_url"]["url"])
elif m.get("type", "") == "text":
system_content_str += m["text"]
else:
# Tool message content will always be a string
system_content_str += msg_content
msg_i += 1
if system_content_str:
prompt += f"### System:\n{system_content_str}\n\n"
assistant_content_str = "" assistant_content_str = ""
## MERGE CONSECUTIVE ASSISTANT CONTENT ## ## MERGE CONSECUTIVE ASSISTANT CONTENT ##
while msg_i < len(messages) and messages[msg_i]["role"] == "assistant": while msg_i < len(messages) and messages[msg_i]["role"] == "assistant":

11
tests/llm_translation/test_prompt_factory.py
View file

@ -743,3 +743,14 @@ def test_hf_chat_template():
chat_template.rstrip() chat_template.rstrip()
== """<｜begin▁of▁sentence｜>You are a helpful assistant.<｜User｜>What is the weather in Copenhagen?<｜Assistant｜><think>""" == """<｜begin▁of▁sentence｜>You are a helpful assistant.<｜User｜>What is the weather in Copenhagen?<｜Assistant｜><think>"""
) )
def test_ollama_pt():
from litellm.litellm_core_utils.prompt_templates.factory import ollama_pt
messages = [
{"role": "system", "content": "You are a helpful assistant."},
{"role": "user", "content": "Hello!"},
]
prompt = ollama_pt(model="ollama/llama3.1", messages=messages)
print(prompt)