From 4d23957035a6371287d8f0416de46263d7b4f1de Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Tue, 2 Jul 2024 21:56:32 -0700
Subject: [PATCH] revert: model_validate

---
 backend/apps/webui/models/functions.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/apps/webui/models/functions.py b/backend/apps/webui/models/functions.py
index a7d06eddc..64ed4f3cc 100644
--- a/backend/apps/webui/models/functions.py
+++ b/backend/apps/webui/models/functions.py
@@ -107,7 +107,7 @@ class FunctionsTable:
             Session.commit()
             Session.refresh(result)
             if result:
-                return FunctionModel(**result.__dict__)
+                return FunctionModel.model_validate(result)
             else:
                 return None
         except Exception as e:
@@ -117,19 +117,19 @@ class FunctionsTable:
     def get_function_by_id(self, id: str) -> Optional[FunctionModel]:
         try:
             function = Session.get(Function, id)
-            return FunctionModel(**function.__dict__)
+            return FunctionModel.model_validate(function)
         except:
             return None
 
     def get_functions(self, active_only=False) -> List[FunctionModel]:
         if active_only:
             return [
-                FunctionModel(**function.__dict__)
+                FunctionModel.model_validate(function)
                 for function in Session.query(Function).filter_by(is_active=True).all()
             ]
         else:
             return [
-                FunctionModel(**function.__dict__)
+                FunctionModel.model_validate(function)
                 for function in Session.query(Function).all()
             ]
 
@@ -138,20 +138,20 @@ class FunctionsTable:
     ) -> List[FunctionModel]:
         if active_only:
             return [
-                FunctionModel(**function.__dict__)
+                FunctionModel.model_validate(function)
                 for function in Session.query(Function)
                 .filter_by(type=type, is_active=True)
                 .all()
             ]
         else:
             return [
-                FunctionModel(**function.__dict__)
+                FunctionModel.model_validate(function)
                 for function in Session.query(Function).filter_by(type=type).all()
             ]
 
     def get_global_filter_functions(self) -> List[FunctionModel]:
         return [
-            FunctionModel(**function.__dict__)
+            FunctionModel.model_validate(function)
             for function in Session.query(Function)
             .filter_by(type="filter", is_active=True, is_global=True)
             .all()