OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-26 18:26:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert: model_validate

Browse Source
This commit is contained in:
Timothy J. Baek 2024-07-02 21:56:32 -07:00
parent aa88022624
commit 4d23957035
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ class FunctionsTable:
Session.commit() Session.commit()
Session.refresh(result) Session.refresh(result)
if result: if result:
return FunctionModel(**result.__dict__) return FunctionModel.model_validate(result)
else: else:
return None return None
except Exception as e: except Exception as e:
@ -117,19 +117,19 @@ class FunctionsTable:
def get_function_by_id(self, id: str) -> Optional[FunctionModel]: def get_function_by_id(self, id: str) -> Optional[FunctionModel]:
try: try:
function = Session.get(Function, id) function = Session.get(Function, id)
return FunctionModel(**function.__dict__) return FunctionModel.model_validate(function)
except: except:
return None return None
def get_functions(self, active_only=False) -> List[FunctionModel]: def get_functions(self, active_only=False) -> List[FunctionModel]:
if active_only: if active_only:
return [ return [
FunctionModel(**function.__dict__) FunctionModel.model_validate(function)
for function in Session.query(Function).filter_by(is_active=True).all() for function in Session.query(Function).filter_by(is_active=True).all()
] ]
else: else:
return [ return [
FunctionModel(**function.__dict__) FunctionModel.model_validate(function)
for function in Session.query(Function).all() for function in Session.query(Function).all()
] ]
@ -138,20 +138,20 @@ class FunctionsTable:
) -> List[FunctionModel]: ) -> List[FunctionModel]:
if active_only: if active_only:
return [ return [
FunctionModel(**function.__dict__) FunctionModel.model_validate(function)
for function in Session.query(Function) for function in Session.query(Function)
.filter_by(type=type, is_active=True) .filter_by(type=type, is_active=True)
.all() .all()
] ]
else: else:
return [ return [
FunctionModel(**function.__dict__) FunctionModel.model_validate(function)
for function in Session.query(Function).filter_by(type=type).all() for function in Session.query(Function).filter_by(type=type).all()
] ]
def get_global_filter_functions(self) -> List[FunctionModel]: def get_global_filter_functions(self) -> List[FunctionModel]:
return [ return [
FunctionModel(**function.__dict__) FunctionModel.model_validate(function)
for function in Session.query(Function) for function in Session.query(Function)
.filter_by(type="filter", is_active=True, is_global=True) .filter_by(type="filter", is_active=True, is_global=True)
.all() .all()