f3-data-models 0.3.5__tar.gz → 0.3.6__tar.gz

{f3_data_models-0.3.5 → f3_data_models-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: f3-data-models
-Version: 0.3.5
+Version: 0.3.6
 Summary: The data schema and models for F3 Nation applications.
 License: MIT
 Author: Evan Petzoldt

{f3_data_models-0.3.5 → f3_data_models-0.3.6}/f3_data_models/utils.py

@@ -3,11 +3,13 @@ from dataclasses import dataclass
 from typing import List, Optional, Tuple, TypeVar
 
 import sqlalchemy
-from sqlalchemy import Select, and_, select
+from sqlalchemy import Select, and_, select, inspect
 
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker, joinedload
+from sqlalchemy.orm.collections import InstrumentedList
+from sqlalchemy.orm.attributes import flag_modified
 
 from f3_data_models.models import Base
 
@@ -166,21 +168,61 @@ class DbManager:
 
     def update_record(cls: T, id, fields):
         session = get_session()
-        try:
-            session.query(cls).filter(cls.id == id).update(
-                fields, synchronize_session="fetch"
-            )
-            session.flush()
-        finally:
-            session.commit()
-            close_session(session)
-
-    def update_records(cls: T, filters, fields):
+        # Fetch the object to be updated
+        obj = session.query(cls).get(id)
+        if not obj:
+            raise ValueError(f"Object with id {id} not found")
+
+        # Get the list of valid attributes for the class
+        valid_attributes = {attr.key for attr in inspect(cls).mapper.column_attrs}
+        valid_relationships = {rel.key for rel in inspect(cls).mapper.relationships}
+
+        # Update simple fields
+        for key, value in fields.items():
+            if key in valid_attributes and not isinstance(value, InstrumentedList):
+                setattr(obj, key, value)
+
+        # Update relationships
+        for key, value in fields.items():
+            if key in valid_relationships and isinstance(value, InstrumentedList):
+                related_objects = getattr(obj, key)
+                related_objects.clear()
+                related_objects.extend(value)
+
+        # Flag the object as modified to ensure changes are detected
+        flag_modified(obj, key)
+
+        # Commit the changes
+        session.commit()
+
+    def update_records(cls, filters, fields):
         session = get_session()
         try:
-            session.query(cls).filter(and_(*filters)).update(
-                fields, synchronize_session="fetch"
-            )
+            # Fetch the objects to be updated
+            objects = session.query(cls).filter(and_(*filters)).all()
+
+            # Get the list of valid attributes for the class
+            valid_attributes = {attr.key for attr in inspect(cls).mapper.column_attrs}
+            valid_relationships = {rel.key for rel in inspect(cls).mapper.relationships}
+
+            for obj in objects:
+                # Update simple fields
+                for key, value in fields.items():
+                    if key in valid_attributes and not isinstance(
+                        value, InstrumentedList
+                    ):
+                        setattr(obj, key, value)
+
+                # Update relationships
+                for key, value in fields.items():
+                    if key in valid_relationships and isinstance(
+                        value, InstrumentedList
+                    ):
+                        related_objects = getattr(obj, key)
+                        related_objects.clear()
+                        related_objects.extend(value)
+                        flag_modified(obj, key)
+
             session.flush()
         finally:
             session.commit()

{f3_data_models-0.3.5 → f3_data_models-0.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "f3-data-models"
-version = "0.3.5"
+version = "0.3.6"
 description = "The data schema and models for F3 Nation applications."
 authors = ["Evan Petzoldt <evan.petzoldt@protonmail.com>"]
 readme = "README.md"