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

refac/enh: forward headers to tool server

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-09-01 01:52:10 +04:00
parent 487979859a
commit 77b65ccbfb
5 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
backend/open_webui/utils/tools.py
View file

@ -119,18 +119,26 @@ async def get_tools(
function_name = spec["name"]
auth_type = tool_server_connection.get("auth_type", "bearer")
token = None
headers = {}
if auth_type == "bearer":
token = tool_server_connection.get("key", "")
headers["Authorization"] = (
f"Bearer {tool_server_connection.get("key", "")}"
)
elif auth_type == "session":
token = request.state.token.credentials
headers["Authorization"] = (
f"Bearer {request.state.token.credentials}"
)
elif auth_type == "request_headers":
headers.update(dict(request.headers))
def make_tool_function(function_name, token, tool_server_data):
headers["Content-Type"] = "application/json"
def make_tool_function(function_name, tool_server_data, headers):
async def tool_function(**kwargs):
return await execute_tool_server(
token=token,
url=tool_server_data["url"],
headers=headers,
name=function_name,
params=kwargs,
server_data=tool_server_data,
@ -139,7 +147,7 @@ async def get_tools(
return tool_function
tool_function = make_tool_function(
function_name, token, tool_server_data
function_name, tool_server_data, headers
)
callable = get_async_tool_function_and_apply_extra_params(
@ -610,7 +618,11 @@ async def get_tool_servers_data(
async def execute_tool_server(
token: str, url: str, name: str, params: Dict[str, Any], server_data: Dict[str, Any]
url: str,
headers: Dict[str, str],
name: str,
params: Dict[str, Any],
server_data: Dict[str, Any],
) -> Any:
error = None
try:
@ -671,11 +683,6 @@ async def execute_tool_server(
f"Request body expected for operation '{name}' but none found."
)
headers = {"Content-Type": "application/json"}
if token:
headers["Authorization"] = f"Bearer {token}"
async with aiohttp.ClientSession(
trust_env=True, timeout=aiohttp.ClientTimeout(total=AIOHTTP_CLIENT_TIMEOUT)
) as session:

1
src/lib/apis/openai/index.ts
View file

@ -372,6 +372,7 @@ export const generateOpenAIChatCompletion = async (
Authorization: `Bearer ${token}`,
'Content-Type': 'application/json'
},
credentials: 'include',
body: JSON.stringify(body)
})
.then(async (res) => {

10
src/lib/components/AddServerModal.svelte
View file

@ -285,6 +285,10 @@
>
<option value="bearer">{$i18n.t('Bearer')}</option>
<option value="session">{$i18n.t('Session')}</option>
{#if !direct}
<option value="request_headers">{$i18n.t('Request Headers')}</option>
{/if}
</select>
</div>
@ -301,6 +305,12 @@
>
{$i18n.t('Forwards system user session credentials to authenticate')}
</div>
{:else if auth_type === 'request_headers'}
<div
class={`text-xs self-center translate-y-[1px] ${($settings?.highContrastMode ?? false) ? 'text-gray-800 dark:text-gray-100' : 'text-gray-500'}`}
>
{$i18n.t('Forwards system user headers to authenticate')}
</div>
{/if}
</div>
</div>

2
src/lib/components/notes/NoteEditor/Chat.svelte
View file

@ -43,7 +43,7 @@
} from '$lib/constants';
import { WEBUI_NAME, config, user, models, settings } from '$lib/stores';
import { chatCompletion, generateOpenAIChatCompletion } from '$lib/apis/openai';
import { chatCompletion } from '$lib/apis/openai';
import { splitStream } from '$lib/utils';

2
src/lib/components/playground/Chat.svelte
View file

@ -12,7 +12,7 @@
} from '$lib/constants';
import { WEBUI_NAME, config, user, models, settings } from '$lib/stores';
import { chatCompletion, generateOpenAIChatCompletion } from '$lib/apis/openai';
import { chatCompletion } from '$lib/apis/openai';
import { splitStream } from '$lib/utils';
import Collapsible from '../common/Collapsible.svelte';