From 16ec25d2962e82346b773679033275e755257f30 Mon Sep 17 00:00:00 2001
From: Michael Poluektov <michael.poluektov@gmail.com>
Date: Thu, 22 Aug 2024 13:34:35 +0100
Subject: [PATCH] fix user valves

---
 backend/apps/webui/main.py | 45 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/backend/apps/webui/main.py b/backend/apps/webui/main.py
index bede4b4f8..661e2fbd6 100644
--- a/backend/apps/webui/main.py
+++ b/backend/apps/webui/main.py
@@ -56,12 +56,15 @@ from apps.socket.main import get_event_call, get_event_emitter
 
 import inspect
 import json
+import logging
 
 from typing import Iterator, Generator, AsyncGenerator
 from pydantic import BaseModel
 
 app = FastAPI()
 
+log = logging.getLogger(__name__)
+
 app.state.config = AppConfig()
 
 app.state.config.ENABLE_SIGNUP = ENABLE_SIGNUP
@@ -243,33 +246,23 @@ def get_pipe_id(form_data: dict) -> str:
     return pipe_id
 
 
-def get_function_params(function_module, form_data, user, extra_params={}):
+def get_function_params(function_module, form_data, user, extra_params=None):
+    if extra_params is None:
+        extra_params = {}
+
     pipe_id = get_pipe_id(form_data)
     # Get the signature of the function
     sig = inspect.signature(function_module.pipe)
-    params = {"body": form_data}
+    addition_params = {k: v for k, v in extra_params.items() if k in sig.parameters}
+    params = {"body": form_data} | addition_params
 
-    for key, value in extra_params.items():
-        if key in sig.parameters:
-            params[key] = value
-
-    if "__user__" in sig.parameters:
-        __user__ = {
-            "id": user.id,
-            "email": user.email,
-            "name": user.name,
-            "role": user.role,
-        }
-
-        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["__user__"] = __user__
+    if "__user__" in params and hasattr(function_module, "UserValves"):
+        user_valves = Functions.get_user_valves_by_id_and_user_id(pipe_id, user.id)
+        if user_valves:
+            try:
+                params["__user__"]["valves"] = function_module.UserValves(**user_valves)
+            except Exception as e:
+                log.exception(e)
     return params
 
 
@@ -298,6 +291,12 @@ async def generate_function_chat_completion(form_data, user):
         "__event_emitter__": __event_emitter__,
         "__event_call__": __event_call__,
         "__task__": __task__,
+        "__user__": {
+            "id": user.id,
+            "email": user.email,
+            "name": user.name,
+            "role": user.role,
+        },
     }
     tools_params = {
         **extra_params,