oobabooga/text-generation-webui
1
0
Fork 0
mirror of https://github.com/oobabooga/text-generation-webui.git synced 2026-01-20 15:40:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code simplifications, fix impersonate

Browse source
This commit is contained in:
oobabooga 2025-08-25 18:05:40 -07:00
parent b330ec3517
commit c1aa4590ea
1 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
modules/chat.py
View file

@ -228,44 +228,48 @@ def generate_chat_prompt(user_input, state, **kwargs):
user_input = user_input.strip()
# Check if we have attachments
has_attachments = False
if not impersonate and not _continue and len(history_data.get('metadata', {})) > 0:
current_row_idx = len(history)
user_key = f"user_{current_row_idx}"
has_attachments = user_key in metadata and "attachments" in metadata[user_key]
if (user_input or has_attachments) and not impersonate and not _continue:
# For the current user input being processed, check if we need to add attachments
if not (impersonate or _continue):
has_attachments = False
if len(history_data.get('metadata', {})) > 0:
current_row_idx = len(history)
user_key = f"user_{current_row_idx}"
has_attachments = user_key in metadata and "attachments" in metadata[user_key]
if user_key in metadata and "attachments" in metadata[user_key]:
attachments_text = ""
image_refs = ""
if user_input or has_attachments:
# For the current user input being processed, check if we need to add attachments
if len(history_data.get('metadata', {})) > 0:
current_row_idx = len(history)
user_key = f"user_{current_row_idx}"
for attachment in metadata[user_key]["attachments"]:
if attachment.get("type") == "image":
image_refs += "<__media__>"
else:
filename = attachment.get("name", "file")
content = attachment.get("content", "")
if attachment.get("type") == "text/html" and attachment.get("url"):
attachments_text += f"\nName: {filename}\nURL: {attachment['url']}\nContents:\n\n=====\n{content}\n=====\n\n"
if user_key in metadata and "attachments" in metadata[user_key]:
attachments_text = ""
image_refs = ""
for attachment in metadata[user_key]["attachments"]:
if attachment.get("type") == "image":
image_refs += "<__media__>"
else:
attachments_text += f"\nName: {filename}\nContents:\n\n=====\n{content}\n=====\n\n"
filename = attachment.get("name", "file")
content = attachment.get("content", "")
if attachment.get("type") == "text/html" and attachment.get("url"):
attachments_text += f"\nName: {filename}\nURL: {attachment['url']}\nContents:\n\n=====\n{content}\n=====\n\n"
else:
attachments_text += f"\nName: {filename}\nContents:\n\n=====\n{content}\n=====\n\n"
if image_refs:
user_input = f"{image_refs}\n\n{user_input}"
if attachments_text:
user_input += f"\n\nATTACHMENTS:\n{attachments_text}"
if image_refs:
user_input = f"{image_refs}\n\n{user_input}"
if attachments_text:
user_input += f"\n\nATTACHMENTS:\n{attachments_text}"
messages.append({"role": "user", "content": user_input})
messages.append({"role": "user", "content": user_input})
if impersonate:
messages.append({"role": "user", "content": "fake user message replace me"})
def make_prompt(messages):
prompt = renderer(
messages=messages[:-1] if _continue else messages,
add_generation_prompt=(state['mode'] != 'chat-instruct')
add_generation_prompt=(state['mode'] != 'chat-instruct' and not impersonate)
)
if state['mode'] == 'chat-instruct':
@ -298,6 +302,10 @@ def generate_chat_prompt(user_input, state, **kwargs):
if _continue:
prompt += messages[-1].get('content', '')
if impersonate:
prompt = prompt.split("fake user message replace me", 1)[0]
prompt += user_input
return prompt
prompt = make_prompt(messages)