UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-26 22:09:51 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fix: ollama rag issue workaround

Browse Source
This commit is contained in:
Timothy J. Baek 2024-07-26 12:22:13 +01:00
parent e691839771
commit 1aaa2e8219
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend/main.py
View File

@ -79,6 +79,7 @@ from utils.task import (
from utils.misc import ( from utils.misc import (
get_last_user_message, get_last_user_message,
add_or_update_system_message, add_or_update_system_message,
prepend_to_first_user_message_content,
parse_duration, parse_duration,
) )
@ -686,12 +687,23 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
if len(contexts) > 0: if len(contexts) > 0:
context_string = "/n".join(contexts).strip() context_string = "/n".join(contexts).strip()
prompt = get_last_user_message(body["messages"]) prompt = get_last_user_message(body["messages"])
body["messages"] = add_or_update_system_message(
rag_template( # Workaround for Ollama 2.0+ system prompt issue
rag_app.state.config.RAG_TEMPLATE, context_string, prompt # TODO: replace with add_or_update_system_message
), if model["owned_by"] == "ollama":
body["messages"], body["messages"] = prepend_to_first_user_message_content(
) rag_template(
rag_app.state.config.RAG_TEMPLATE, context_string, prompt
),
body["messages"],
)
else:
body["messages"] = add_or_update_system_message(
rag_template(
rag_app.state.config.RAG_TEMPLATE, context_string, prompt
),
body["messages"],
)
# If there are citations, add them to the data_items # If there are citations, add them to the data_items
if len(citations) > 0: if len(citations) > 0:

15
backend/utils/misc.py
View File

@ -53,6 +53,21 @@ def pop_system_message(messages: List[dict]) -> Tuple[dict, List[dict]]:
return get_system_message(messages), remove_system_message(messages) return get_system_message(messages), remove_system_message(messages)
def prepend_to_first_user_message_content(
content: str, messages: List[dict]
) -> List[dict]:
for message in messages:
if message["role"] == "user":
if isinstance(message["content"], list):
for item in message["content"]:
if item["type"] == "text":
item["text"] = f"{content}\n{item['text']}"
else:
message["content"] = f"{content}\n{message['content']}"
break
return messages
def add_or_update_system_message(content: str, messages: List[dict]): def add_or_update_system_message(content: str, messages: List[dict]):
""" """
Adds a new system message at the beginning of the messages list Adds a new system message at the beginning of the messages list