refac

Author: tjbck

backend/open_webui/utils/middleware.py

@@ -226,7 +226,7 @@ async def tool_call_handler(tool_call):
 
                 if isinstance(tool_result, str):
                     tool = tools[tool_function_name]
-                    tool_id = tool.get("toolkit_id", "")
+                    tool_id = tool.get("tool_id", "")
                     if tool.get("metadata", {}).get("citation", False) or tool.get(
                         "direct", False
                     ):

backend/open_webui/utils/plugin.py

@@ -68,23 +68,23 @@ def replace_imports(content):
     return content
 
 
-def load_tools_module_by_id(toolkit_id, content=None):
+def load_tools_module_by_id(tool_id, content=None):
 
     if content is None:
-        tool = Tools.get_tool_by_id(toolkit_id)
+        tool = Tools.get_tool_by_id(tool_id)
         if not tool:
-            raise Exception(f"Toolkit not found: {toolkit_id}")
+            raise Exception(f"Toolkit not found: {tool_id}")
 
         content = tool.content
 
         content = replace_imports(content)
-        Tools.update_tool_by_id(toolkit_id, {"content": content})
+        Tools.update_tool_by_id(tool_id, {"content": content})
     else:
         frontmatter = extract_frontmatter(content)
         # Install required packages found within the frontmatter
         install_frontmatter_requirements(frontmatter.get("requirements", ""))
 
-    module_name = f"tool_{toolkit_id}"
+    module_name = f"tool_{tool_id}"
     module = types.ModuleType(module_name)
     sys.modules[module_name] = module
 
@@ -108,7 +108,7 @@ def load_tools_module_by_id(toolkit_id, content=None):
         else:
             raise Exception("No Tools class found in the module")
     except Exception as e:
-        log.error(f"Error loading module: {toolkit_id}: {e}")
+        log.error(f"Error loading module: {tool_id}: {e}")
         del sys.modules[module_name]  # Clean up
         raise e
     finally:

backend/open_webui/utils/tools.py

@@ -40,15 +40,14 @@ async def new_function(*args, **kwargs):
     return new_function
 
 
-# Mutation on extra_params
 def get_tools(
     request: Request, tool_ids: list[str], user: UserModel, extra_params: dict
 ) -> dict[str, dict]:
     tools_dict = {}
 
     for tool_id in tool_ids:
-        tools = Tools.get_tool_by_id(tool_id)
-        if tools is None:
+        tool = Tools.get_tool_by_id(tool_id)
+        if tool is None:
 
             if tool_id.startswith("server:"):
                 server_idx = int(tool_id.split(":")[1])
@@ -57,17 +56,17 @@ def get_tools(
                 tool_dict = {
                     "spec": spec,
                     "callable": callable,
-                    "toolkit_id": tool_id,
+                    "tool_id": tool_id,
                     # Misc info
                     "metadata": {
                         "file_handler": hasattr(module, "file_handler")
                         and module.file_handler,
                         "citation": hasattr(module, "citation") and module.citation,
                     },
                 }
-
+            else:
+                continue
         else:
-
             module = request.app.state.TOOLS.get(tool_id, None)
             if module is None:
                 module, _ = load_tools_module_by_id(tool_id)
@@ -83,7 +82,7 @@ def get_tools(
                     **Tools.get_user_valves_by_id_and_user_id(tool_id, user.id)
                 )
 
-            for spec in tools.specs:
+            for spec in tool.specs:
                 # TODO: Fix hack for OpenAI API
                 # Some times breaks OpenAI but others don't. Leaving the comment
                 for val in spec.get("parameters", {}).get("properties", {}).values():
@@ -114,7 +113,7 @@ def get_tools(
                 tool_dict = {
                     "spec": spec,
                     "callable": callable,
-                    "toolkit_id": tool_id,
+                    "tool_id": tool_id,
                     # Misc info
                     "metadata": {
                         "file_handler": hasattr(module, "file_handler")
@@ -128,8 +127,8 @@ def get_tools(
                     log.warning(
                         f"Tool {function_name} already exists in another tools!"
                     )
-                    log.warning(f"Collision between {tools} and {tool_id}.")
-                    log.warning(f"Discarding {tools}.{function_name}")
+                    log.warning(f"Collision between {tool} and {tool_id}.")
+                    log.warning(f"Discarding {tool}.{function_name}")
                 else:
                     tools_dict[function_name] = tool_dict
 
@@ -239,8 +238,9 @@ def get_callable_attributes(tool: object) -> list[Callable]:
 
 
 def get_tools_specs(tool_class: object) -> list[dict]:
-    function_list = get_callable_attributes(tool_class)
-    function_model_list = map(function_to_pydantic_model, function_list)
+    function_model_list = map(
+        function_to_pydantic_model, get_callable_attributes(tool_class)
+    )
     return [
         convert_to_openai_function(function_model)
         for function_model in function_model_list