Commit 4d239570 authored by Timothy J. Baek's avatar Timothy J. Baek
Browse files

revert: model_validate

parent aa880226
...@@ -107,7 +107,7 @@ class FunctionsTable: ...@@ -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: ...@@ -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: ...@@ -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()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment