Mirrors/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-15 19:37:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy J. Baek
2024-06-23 19:18:13 -07:00
parent 26e735618e
commit 0cf936f9e8
5 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/apps/webui/models/functions.py
View File

@@ -143,10 +143,10 @@ class FunctionsTable:
for function in Function.select().where(Function.type == type)
]
def get_function_valves_by_id(self, id: str) -> Optional[FunctionValves]:
def get_function_valves_by_id(self, id: str) -> Optional[dict]:
try:
function = Function.get(Function.id == id)
return FunctionValves(**model_to_dict(function))
return function.valves if "valves" in function and function.valves else {}
except Exception as e:
print(f"An error occurred: {e}")
return None

4
backend/apps/webui/models/tools.py
View File

@@ -114,10 +114,10 @@ class ToolsTable:
def get_tools(self) -> List[ToolModel]:
return [ToolModel(**model_to_dict(tool)) for tool in Tool.select()]
def get_tool_valves_by_id(self, id: str) -> Optional[ToolValves]:
def get_tool_valves_by_id(self, id: str) -> Optional[dict]:
try:
tool = Tool.get(Tool.id == id)
return ToolValves(**model_to_dict(tool))
return tool.valves if "valves" in tool and tool.valves else {}
except Exception as e:
print(f"An error occurred: {e}")
return None

4
backend/apps/webui/routers/functions.py
View File

@@ -127,8 +127,8 @@ async def get_function_valves_by_id(id: str, user=Depends(get_admin_user)):
function = Functions.get_function_by_id(id)
if function:
try:
function_valves = Functions.get_function_valves_by_id(id)
return function_valves.valves
valves = Functions.get_function_valves_by_id(id)
return valves
except Exception as e:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,

4
backend/apps/webui/routers/tools.py
View File

@@ -133,8 +133,8 @@ async def get_toolkit_valves_by_id(id: str, user=Depends(get_admin_user)):
toolkit = Tools.get_tool_by_id(id)
if toolkit:
try:
tool_valves = Tools.get_tool_valves_by_id(id)
return tool_valves.valves
valves = Tools.get_tool_valves_by_id(id)
return valves
except Exception as e:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,