UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-26 22:09:51 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fix: fixing problems with function with parameters

Browse Source
This commit is contained in:
smonux 2024-10-14 20:38:26 +02:00
parent 25e06c849c
commit 74fb420942
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/open_webui/main.py
View File

@ -515,8 +515,13 @@ async def handle_streaming_response(request: Request, response: Response,
for tool_call in tool_calls: for tool_call in tool_calls:
tool_function_name = tool_call["function"]["name"] tool_function_name = tool_call["function"]["name"]
tool_function_params = extract_json(tool_call["function"]["arguments"]) tool_function_params = extract_json(tool_call["function"]["arguments"])
tool_function_params = {} if tool_function_params is None else tool_function_params
if not tool_call["function"]["arguments"]:
tool_function_params = {}
else:
tool_function_params = json.loads(tool_call["function"]["arguments"])
log.debug(f"calling {tool_function_name} with params {tool_function_params}")
try: try:
tool_output = await tools[tool_function_name]["callable"](**tool_function_params) tool_output = await tools[tool_function_name]["callable"](**tool_function_params)
except Exception as e: except Exception as e:
@ -552,7 +557,6 @@ async def handle_streaming_response(request: Request, response: Response,
except StopAsyncIteration: except StopAsyncIteration:
pass pass
except Exception as e: except Exception as e:
import pdb; pdb.set_trace()
log.exception(f"Error: {e}") log.exception(f"Error: {e}")
return StreamingResponse( return StreamingResponse(
@ -578,9 +582,10 @@ async def handle_nonstreaming_response(request: Request, response: Response,
tool_calls = response_dict["choices"][0]["message"].get("tool_calls", []) tool_calls = response_dict["choices"][0]["message"].get("tool_calls", [])
for tool_call in tool_calls: for tool_call in tool_calls:
tool_function_name = tool_call["function"]["name"] tool_function_name = tool_call["function"]["name"]
tool_function_params = extract_json(tool_call["function"]["arguments"]) if not tool_call["function"]["arguments"]:
tool_function_params = {}
tool_function_params = {} if tool_function_params is None else tool_function_params else:
tool_function_params = json.loads(tool_call["function"]["arguments"])
try: try:
tool_output = await tools[tool_function_name]["callable"](**tool_function_params) tool_output = await tools[tool_function_name]["callable"](**tool_function_params)
@ -609,9 +614,10 @@ async def handle_nonstreaming_response(request: Request, response: Response,
response_dict = await generate_chat_completions(form_data = body, user = user ) response_dict = await generate_chat_completions(form_data = body, user = user )
#FIXME: handle citations and data_items (Streaming Response) #FIXME: is it possible to handle citations?
return JSONResponse(content = response_dict) return JSONResponse(content = response_dict)
async def chat_completion_tools_handler( async def chat_completion_tools_handler(
body: dict, user: UserModel, extra_params: dict body: dict, user: UserModel, extra_params: dict
) -> tuple[dict, dict]: ) -> tuple[dict, dict]: