OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-05-17 12:03:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy J. Baek 2024-06-22 14:06:19 -07:00
parent 03bb4bcda6
commit 5b64c28f33
1 changed files with 70 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
backend/main.py
View File

@ -271,27 +271,24 @@ async def get_function_call_response(
if "__user__" in sig.parameters: if "__user__" in sig.parameters:
# Call the function with the '__user__' parameter included # Call the function with the '__user__' parameter included
params = { __user__ = {
**params, "id": user.id,
"__user__": { "email": user.email,
"id": user.id, "name": user.name,
"email": user.email, "role": user.role,
"name": user.name,
"role": user.role,
**(
{
"valves": toolkit_module.UserValves(
**Tools.get_user_valves_by_id_and_user_id(
tool_id, user.id
)
)
}
if hasattr(toolkit_module, "UserValves")
else {}
),
},
} }
try:
if hasattr(toolkit_module, "UserValves"):
__user__["valves"] = toolkit_module.UserValves(
**Tools.get_user_valves_by_id_and_user_id(
tool_id, user.id
)
)
except Exception as e:
print(e)
params = {**params, "__user__": __user__}
if "__messages__" in sig.parameters: if "__messages__" in sig.parameters:
# Call the function with the '__messages__' parameter included # Call the function with the '__messages__' parameter included
params = { params = {
@ -405,29 +402,27 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
param = {"body": data} param = {"body": data}
if "__user__" in sig.parameters: if "__user__" in sig.parameters:
param = { __user__ = {
**param, "id": user.id,
"__user__": { "email": user.email,
"id": user.id, "name": user.name,
"email": user.email, "role": user.role,
"name": user.name,
"role": user.role,
**(
{
"valves": function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
filter_id, user.id
)
)
}
if hasattr(
function_module, "UserValves"
)
else {}
),
},
} }
try:
if hasattr(function_module, "UserValves"):
__user__["valves"] = (
function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
filter_id, user.id
)
)
)
except Exception as e:
print(e)
params = {**params, "__user__": __user__}
if "__id__" in sig.parameters: if "__id__" in sig.parameters:
param = { param = {
**param, **param,
@ -889,27 +884,25 @@ async def generate_chat_completions(form_data: dict, user=Depends(get_verified_u
param = {"body": form_data} param = {"body": form_data}
if "__user__" in sig.parameters: if "__user__" in sig.parameters:
param = { __user__ = {
**param, "id": user.id,
"__user__": { "email": user.email,
"id": user.id, "name": user.name,
"email": user.email, "role": user.role,
"name": user.name,
"role": user.role,
**(
{
"valves": function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
pipe_id, user.id
)
)
}
if hasattr(function_module, "UserValves")
else {}
),
},
} }
try:
if hasattr(function_module, "UserValves"):
__user__["valves"] = function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
pipe_id, user.id
)
)
except Exception as e:
print(e)
params = {**params, "__user__": __user__}
if form_data["stream"]: if form_data["stream"]:
async def stream_content(): async def stream_content():
@ -974,7 +967,7 @@ async def generate_chat_completions(form_data: dict, user=Depends(get_verified_u
res = pipe(**param) res = pipe(**param)
except Exception as e: except Exception as e:
print(f"Error: {e}") print(f"Error: {e}")
return {"error": {"detail":str(e)}} return {"error": {"detail": str(e)}}
if inspect.iscoroutinefunction(pipe): if inspect.iscoroutinefunction(pipe):
res = await pipe(**param) res = await pipe(**param)
@ -1114,27 +1107,25 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)):
param = {"body": data} param = {"body": data}
if "__user__" in sig.parameters: if "__user__" in sig.parameters:
param = { __user__ = {
**param, "id": user.id,
"__user__": { "email": user.email,
"id": user.id, "name": user.name,
"email": user.email, "role": user.role,
"name": user.name,
"role": user.role,
**(
{
"valves": function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
filter_id, user.id
)
)
}
if hasattr(function_module, "UserValves")
else {}
),
},
} }
try:
if hasattr(function_module, "UserValves"):
__user__["valves"] = function_module.UserValves(
**Functions.get_user_valves_by_id_and_user_id(
filter_id, user.id
)
)
except Exception as e:
print(e)
params = {**params, "__user__": __user__}
if "__id__" in sig.parameters: if "__id__" in sig.parameters:
param = { param = {
**param, **param,