OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-23 02:16:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refac: response parse

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-02-05 14:10:53 -08:00
parent ff84c120f5
commit 648878782b
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/open_webui/utils/middleware.py
View File

@ -1213,6 +1213,8 @@ async def process_chat_response(
def extract_attributes(tag_content): def extract_attributes(tag_content):
"""Extract attributes from a tag if they exist.""" """Extract attributes from a tag if they exist."""
attributes = {} attributes = {}
if not tag_content: # Ensure tag_content is not None
return attributes
# Match attributes in the format: key="value" (ignores single quotes for simplicity) # Match attributes in the format: key="value" (ignores single quotes for simplicity)
matches = re.findall(r'(\w+)\s*=\s*"([^"]+)"', tag_content) matches = re.findall(r'(\w+)\s*=\s*"([^"]+)"', tag_content)
for key, value in matches: for key, value in matches:
@ -1222,11 +1224,16 @@ async def process_chat_response(
if content_blocks[-1]["type"] == "text": if content_blocks[-1]["type"] == "text":
for tag in tags: for tag in tags:
# Match start tag e.g., <tag> or <tag attr="value"> # Match start tag e.g., <tag> or <tag attr="value">
start_tag_pattern = rf"<{tag}(.*?)>" start_tag_pattern = rf"<{tag}(\s.*?)?>"
match = re.search(start_tag_pattern, content) match = re.search(start_tag_pattern, content)
if match: if match:
# Extract attributes in the tag (if present) attr_content = (
attributes = extract_attributes(match.group(1)) match.group(1) if match.group(1) else ""
) # Ensure it's not None
attributes = extract_attributes(
attr_content
) # Extract attributes safely
# Remove the start tag from the currently handling text block # Remove the start tag from the currently handling text block
content_blocks[-1]["content"] = content_blocks[-1][ content_blocks[-1]["content"] = content_blocks[-1][
"content" "content"
@ -1251,6 +1258,7 @@ async def process_chat_response(
# Match end tag e.g., </tag> # Match end tag e.g., </tag>
end_tag_pattern = rf"</{tag}>" end_tag_pattern = rf"</{tag}>"
# Check if the content has the end tag
if re.search(end_tag_pattern, content): if re.search(end_tag_pattern, content):
end_flag = True end_flag = True
@ -1274,9 +1282,6 @@ async def process_chat_response(
split_content[1].strip() if len(split_content) > 1 else "" split_content[1].strip() if len(split_content) > 1 else ""
) )
print(f"block_content: {block_content}")
print(f"leftover_content: {leftover_content}")
if block_content: if block_content:
content_blocks[-1]["content"] = block_content content_blocks[-1]["content"] = block_content
content_blocks[-1]["ended_at"] = time.time() content_blocks[-1]["ended_at"] = time.time()
@ -1332,7 +1337,14 @@ async def process_chat_response(
"code_interpreter", False "code_interpreter", False
) )
reasoning_tags = ["think", "reason", "reasoning", "thought", "Thought"] reasoning_tags = [
"think",
"thinking",
"reason",
"reasoning",
"thought",
"Thought",
]
code_interpreter_tags = ["code_interpreter"] code_interpreter_tags = ["code_interpreter"]
try: try: