From 6ccb5e8f67e0ae26ebc82960dc0b2ef148d2078c Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Sat, 22 Jun 2024 12:14:12 -0700 Subject: [PATCH] feat: user valves support --- backend/main.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/backend/main.py b/backend/main.py index 0b7f23bde..6135d59a3 100644 --- a/backend/main.py +++ b/backend/main.py @@ -278,6 +278,9 @@ async def get_function_call_response( "email": user.email, "name": user.name, "role": user.role, + "valves": Tools.get_user_valves_by_id_and_user_id( + tool_id, user.id + ), }, } @@ -401,6 +404,9 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware): "email": user.email, "name": user.name, "role": user.role, + "valves": Functions.get_user_valves_by_id_and_user_id( + filter_id, user.id + ), }, } @@ -871,10 +877,14 @@ async def generate_chat_completions(form_data: dict, user=Depends(get_verified_u "email": user.email, "name": user.name, "role": user.role, + "valves": Functions.get_user_valves_by_id_and_user_id( + pipe_id, user.id + ), }, } if form_data["stream"]: + async def stream_content(): if inspect.iscoroutinefunction(pipe): res = await pipe(**param) @@ -1010,7 +1020,12 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)): f"{url}/{filter['id']}/filter/outlet", headers=headers, json={ - "user": {"id": user.id, "name": user.name, "role": user.role}, + "user": { + "id": user.id, + "name": user.name, + "email": user.email, + "role": user.role, + }, "body": data, }, ) @@ -1064,6 +1079,9 @@ async def chat_completed(form_data: dict, user=Depends(get_verified_user)): "email": user.email, "name": user.name, "role": user.role, + "valves": Functions.get_user_valves_by_id_and_user_id( + filter_id, user.id + ), }, }