ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-15 13:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-09-23 02:40:59 -04:00
parent 777e81f7a8
commit de7f7b3d85
6 changed files with 121 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
backend/open_webui/utils/files.py Normal file
View file

@ -0,0 +1,21 @@
from open_webui.routers.images import (
load_b64_image_data,
upload_image,
)
def get_image_url_from_base64(request, base64_image_string, metadata, user):
if "data:image/png;base64" in base64_image_string:
image_url = ""
# Extract base64 image data from the line
image_data, content_type = load_b64_image_data(base64_image_string)
if image_data is not None:
image_url = upload_image(
request,
image_data,
content_type,
metadata,
user,
)
return image_url
return None

11
backend/open_webui/utils/mcp/client.py
View file

@ -60,7 +60,16 @@ class MCPClient:
raise RuntimeError("MCP client is not connected.") raise RuntimeError("MCP client is not connected.")
result = await self.session.call_tool(function_name, function_args) result = await self.session.call_tool(function_name, function_args)
return result.model_dump() if not result:
raise Exception("No result returned from MCP tool call.")
result_dict = result.model_dump()
result_content = result_dict.get("content", {})
if result.isError:
raise Exception(result_content)
else:
return result_content
async def disconnect(self): async def disconnect(self):
# Clean up and close the session # Clean up and close the session

102
backend/open_webui/utils/middleware.py
View file

@ -53,6 +53,7 @@ from open_webui.routers.pipelines import (
from open_webui.routers.memories import query_memory, QueryMemoryForm from open_webui.routers.memories import query_memory, QueryMemoryForm
from open_webui.utils.webhook import post_webhook from open_webui.utils.webhook import post_webhook
from open_webui.utils.files import get_image_url_from_base64
from open_webui.models.users import UserModel from open_webui.models.users import UserModel
@ -1052,9 +1053,6 @@ async def process_chat_payload(request, form_data, user, metadata, model):
def make_tool_function(function_name): def make_tool_function(function_name):
async def tool_function(**kwargs): async def tool_function(**kwargs):
print(
f"Calling MCP tool {function_name} with args {kwargs}"
)
return await mcp_client.call_tool( return await mcp_client.call_tool(
function_name, function_name,
function_args=kwargs, function_args=kwargs,
@ -1106,7 +1104,6 @@ async def process_chat_payload(request, form_data, user, metadata, model):
metadata["mcp_clients"] = mcp_clients metadata["mcp_clients"] = mcp_clients
if tools_dict: if tools_dict:
log.info(f"tools_dict: {tools_dict}")
if metadata.get("params", {}).get("function_calling") == "native": if metadata.get("params", {}).get("function_calling") == "native":
# If the function calling is native, then call the tools function calling handler # If the function calling is native, then call the tools function calling handler
metadata["tools"] = tools_dict metadata["tools"] = tools_dict
@ -2487,20 +2484,14 @@ async def process_chat_response(
else: else:
tool_function = tool["callable"] tool_function = tool["callable"]
print("tool_name", tool_name)
print("tool_function", tool_function)
print("tool_function_params", tool_function_params)
tool_result = await tool_function( tool_result = await tool_function(
**tool_function_params **tool_function_params
) )
print("tool_result", tool_result)
except Exception as e: except Exception as e:
tool_result = str(e) tool_result = str(e)
tool_result_embeds = [] tool_result_embeds = []
if isinstance(tool_result, HTMLResponse): if isinstance(tool_result, HTMLResponse):
content_disposition = tool_result.headers.get( content_disposition = tool_result.headers.get(
"Content-Disposition", "" "Content-Disposition", ""
@ -2573,9 +2564,58 @@ async def process_chat_response(
for item in tool_result: for item in tool_result:
# check if string # check if string
if isinstance(item, str) and item.startswith("data:"): if isinstance(item, str) and item.startswith("data:"):
tool_result_files.append(item) tool_result_files.append(
{
"type": "data",
"content": item,
}
)
tool_result.remove(item) tool_result.remove(item)
if tool.get("type") == "mcp":
if (
isinstance(item, dict)
and item.get("type") == "image"
):
image_url = get_image_url_from_base64(
request,
f"data:{item.get('mimeType', 'image/png')};base64,{item.get('data', '')}",
{
"chat_id": metadata.get(
"chat_id", None
),
"message_id": metadata.get(
"message_id", None
),
"session_id": metadata.get(
"session_id", None
),
},
user,
)
tool_result_files.append(
{
"type": "image",
"url": image_url,
}
)
tool_result.remove(item)
if tool_result_files:
if not isinstance(tool_result, list):
tool_result = [
tool_result,
]
for file in tool_result_files:
tool_result.append(
{
"type": file.get("type", "data"),
"content": "Displayed",
}
)
if isinstance(tool_result, dict) or isinstance( if isinstance(tool_result, dict) or isinstance(
tool_result, list tool_result, list
): ):
@ -2742,23 +2782,18 @@ async def process_chat_response(
if isinstance(stdout, str): if isinstance(stdout, str):
stdoutLines = stdout.split("\n") stdoutLines = stdout.split("\n")
for idx, line in enumerate(stdoutLines): for idx, line in enumerate(stdoutLines):
if "data:image/png;base64" in line: if "data:image/png;base64" in line:
image_url = "" image_url = get_image_url_from_base64(
# Extract base64 image data from the line request,
image_data, content_type = ( line,
load_b64_image_data(line) metadata,
user,
) )
if image_data is not None: if image_url:
image_url = upload_image( stdoutLines[idx] = (
request, f"![Output Image]({image_url})"
image_data,
content_type,
metadata,
user,
) )
stdoutLines[idx] = (
f"![Output Image]({image_url})"
)
output["stdout"] = "\n".join(stdoutLines) output["stdout"] = "\n".join(stdoutLines)
@ -2768,19 +2803,12 @@ async def process_chat_response(
resultLines = result.split("\n") resultLines = result.split("\n")
for idx, line in enumerate(resultLines): for idx, line in enumerate(resultLines):
if "data:image/png;base64" in line: if "data:image/png;base64" in line:
image_url = "" image_url = get_image_url_from_base64(
# Extract base64 image data from the line request,
image_data, content_type = ( line,
load_b64_image_data(line) metadata,
user,
) )
if image_data is not None:
image_url = upload_image(
request,
image_data,
content_type,
metadata,
user,
)
resultLines[idx] = ( resultLines[idx] = (
f"![Output Image]({image_url})" f"![Output Image]({image_url})"
) )

1
backend/requirements.txt
View file

@ -46,6 +46,7 @@ anthropic
google-genai==1.32.0 google-genai==1.32.0
google-generativeai==0.8.5 google-generativeai==0.8.5
tiktoken tiktoken
mcp==1.14.1
langchain==0.3.26 langchain==0.3.26
langchain-community==0.3.27 langchain-community==0.3.27

2
pyproject.toml
View file

@ -47,6 +47,8 @@ dependencies = [
"asgiref==3.8.1", "asgiref==3.8.1",
"tiktoken", "tiktoken",
"mcp==1.14.1",
"openai", "openai",
"anthropic", "anthropic",
"google-genai==1.32.0", "google-genai==1.32.0",

34
src/lib/components/common/Collapsible.svelte
View file

@ -191,20 +191,30 @@
{/if} {/if}
</div> </div>
{/if} {/if}
{/if}
{/if}
{#if attributes?.done === 'true'} {#if attributes?.done === 'true'}
{#if typeof files === 'object'} {#if typeof files === 'object'}
{#each files ?? [] as file, idx} {#each files ?? [] as file, idx}
{#if file.startsWith('data:image/')} {#if typeof file === 'string'}
<Image {#if file.startsWith('data:image/')}
id={`${collapsibleId}-tool-calls-${attributes?.id}-result-${idx}`} <Image
src={file} id={`${collapsibleId}-tool-calls-${attributes?.id}-result-${idx}`}
alt="Image" src={file}
/> alt="Image"
{/if} />
{/each} {/if}
{:else if typeof file === 'object'}
{#if file.type === 'image' && file.url}
<Image
id={`${collapsibleId}-tool-calls-${attributes?.id}-result-${idx}`}
src={file.url}
alt="Image"
/>
{/if}
{/if} {/if}
{/if} {/each}
{/if} {/if}
{/if} {/if}
{:else} {:else}