mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-12 04:15:25 +00:00
refac
This commit is contained in:
parent
35c1c48fd2
commit
f11bdc6ab5
1 changed files with 7 additions and 0 deletions
|
|
@ -119,6 +119,8 @@ async def get_tools(
|
||||||
function_name = spec["name"]
|
function_name = spec["name"]
|
||||||
|
|
||||||
auth_type = tool_server_connection.get("auth_type", "bearer")
|
auth_type = tool_server_connection.get("auth_type", "bearer")
|
||||||
|
|
||||||
|
cookies = {}
|
||||||
headers = {}
|
headers = {}
|
||||||
|
|
||||||
if auth_type == "bearer":
|
if auth_type == "bearer":
|
||||||
|
|
@ -126,10 +128,12 @@ async def get_tools(
|
||||||
f"Bearer {tool_server_connection.get('key', '')}"
|
f"Bearer {tool_server_connection.get('key', '')}"
|
||||||
)
|
)
|
||||||
elif auth_type == "session":
|
elif auth_type == "session":
|
||||||
|
cookies = request.cookies
|
||||||
headers["Authorization"] = (
|
headers["Authorization"] = (
|
||||||
f"Bearer {request.state.token.credentials}"
|
f"Bearer {request.state.token.credentials}"
|
||||||
)
|
)
|
||||||
elif auth_type == "oauth":
|
elif auth_type == "oauth":
|
||||||
|
cookies = request.cookies
|
||||||
oauth_token = None
|
oauth_token = None
|
||||||
try:
|
try:
|
||||||
oauth_token = (
|
oauth_token = (
|
||||||
|
|
@ -145,6 +149,7 @@ async def get_tools(
|
||||||
f"Bearer {oauth_token.get('access_token', '')}"
|
f"Bearer {oauth_token.get('access_token', '')}"
|
||||||
)
|
)
|
||||||
elif auth_type == "request_headers":
|
elif auth_type == "request_headers":
|
||||||
|
cookies = request.cookies
|
||||||
headers.update(dict(request.headers))
|
headers.update(dict(request.headers))
|
||||||
|
|
||||||
headers["Content-Type"] = "application/json"
|
headers["Content-Type"] = "application/json"
|
||||||
|
|
@ -154,6 +159,7 @@ async def get_tools(
|
||||||
return await execute_tool_server(
|
return await execute_tool_server(
|
||||||
url=tool_server_data["url"],
|
url=tool_server_data["url"],
|
||||||
headers=headers,
|
headers=headers,
|
||||||
|
cookies=cookies,
|
||||||
name=function_name,
|
name=function_name,
|
||||||
params=kwargs,
|
params=kwargs,
|
||||||
server_data=tool_server_data,
|
server_data=tool_server_data,
|
||||||
|
|
@ -635,6 +641,7 @@ async def get_tool_servers_data(
|
||||||
async def execute_tool_server(
|
async def execute_tool_server(
|
||||||
url: str,
|
url: str,
|
||||||
headers: Dict[str, str],
|
headers: Dict[str, str],
|
||||||
|
cookies: Dict[str, str],
|
||||||
name: str,
|
name: str,
|
||||||
params: Dict[str, Any],
|
params: Dict[str, Any],
|
||||||
server_data: Dict[str, Any],
|
server_data: Dict[str, Any],
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue