f3-data-models 0.3.7__py3-none-any.whl → 0.3.8__py3-none-any.whl

f3_data_models/models.py

@@ -17,6 +17,7 @@ from sqlalchemy import (
     UniqueConstraint,
     Enum,
     Uuid,
+    inspect,
 )
 from typing_extensions import Annotated
 from sqlalchemy.orm import (
@@ -25,6 +26,7 @@ from sqlalchemy.orm import (
     Mapped,
     relationship,
 )
+from sqlalchemy.orm.attributes import InstrumentedAttribute
 import enum
 
 # Custom Annotations
@@ -150,6 +152,26 @@ class Base(DeclarativeBase):
             if c.key not in ["created", "updated"]
         }
 
+    def to_update_dict(self) -> Dict[InstrumentedAttribute, Any]:
+        update_dict = {}
+        mapper = inspect(self).mapper
+
+        # Add simple attributes
+        for attr in mapper.column_attrs:
+            if attr.key not in ["created", "updated", "id"]:
+                update_dict[attr] = getattr(self, attr.key)
+
+        # Add relationships
+        for rel in mapper.relationships:
+            related_value = getattr(self, rel.key)
+            if related_value is not None:
+                if rel.uselist:
+                    update_dict[rel] = [item for item in related_value]
+                    print(rel, update_dict[rel])
+                else:
+                    update_dict[rel] = related_value
+        return update_dict
+
     def __repr__(self):
         """
         Get a string representation of the model instance.

f3_data_models/testing.py

@@ -15,7 +15,7 @@ def test_update_event():
         start_time="0500",
         end_time="0600",
         event_x_event_types=[
-            EventType_x_Event(event_type_id=4),
+            EventType_x_Event(event_type_id=3),
         ],
         recurrence_pattern=Event_Cadence.weekly,
         day_of_week=Day_Of_Week.monday,
@@ -23,17 +23,10 @@ def test_update_event():
         index_within_interval=1,
         name="Test Event",
     )
-    update_dict = event.__dict__
+    update_dict = event.to_update_dict()
     DbManager.update_records(Event, [Event.id == 3], update_dict)
 
-    # with get_session() as session:
-    #     # delete event_x_event_types
-    #     session.query(EventType_x_Event).filter(
-    #         EventType_x_Event.event_id == 3
-    #     ).delete()
-    #     # add event_x_event_types
-    #     session.add(EventType_x_Event(event_id=3, event_type_id=4))
-    #     session.commit()
+    event = DbManager.get(Event, 3)
 
 
 if __name__ == "__main__":

f3_data_models/utils.py

@@ -1,6 +1,6 @@
 import os
 from dataclasses import dataclass
-from typing import List, Optional, Tuple, TypeVar
+from typing import List, Optional, Tuple, TypeVar, Type, Generic  # noqa
 
 import sqlalchemy
 from sqlalchemy import Select, and_, select, inspect
@@ -89,7 +89,7 @@ def _joinedloads(cls: T, query: Select, joinedloads: list | str) -> Select:
 
 
 class DbManager:
-    def get(cls: T, id: int, joinedloads: list | str = []) -> T:
+    def get(cls: Type[T], id: int, joinedloads: list | str = []) -> T:
         session = get_session()
         try:
             query = select(cls).filter(cls.id == id)
@@ -175,9 +175,9 @@ class DbManager:
 
             mapper = class_mapper(cls)
             relationships = mapper.relationships.keys()
-            for key, value in fields.items():
+            for attr, value in fields.items():
+                key = attr.key
                 if hasattr(cls, key) and key not in relationships:
-                    attr = getattr(cls, key)
                     if isinstance(attr, InstrumentedAttribute):
                         setattr(record, key, value)
                 elif key in relationships:
@@ -232,14 +232,16 @@ class DbManager:
 
             for obj in objects:
                 # Update simple fields
-                for key, value in fields.items():
+                for attr, value in fields.items():
+                    key = attr.key
                     if key in valid_attributes and not isinstance(
                         value, InstrumentedList
                     ):
                         setattr(obj, key, value)
 
                 # Update relationships separately
-                for key, value in fields.items():
+                for attr, value in fields.items():
+                    key = attr.key
                     if key in valid_relationships:
                         # Handle relationships separately
                         relationship = inspect(cls).mapper.relationships[key]

{f3_data_models-0.3.7.dist-info → f3_data_models-0.3.8.dist-info}/METADATA

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

f3_data_models-0.3.8.dist-info/RECORD

@@ -0,0 +1,7 @@
+f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+f3_data_models/models.py,sha256=jGxAG5Dmzhf2u4cLMUxY48yKENn5HC5N9_eUUSb31yc,45109
+f3_data_models/testing.py,sha256=Pd-TYvkeai2DuN9ubPPdqjo4xS_Zd3T1WGV7J_SXPdc,921
+f3_data_models/utils.py,sha256=UpNx1E_kmt8_1vN4fdFSy55yPCoDA2algzof_5EAJ2k,13835
+f3_data_models-0.3.8.dist-info/METADATA,sha256=Hza4-PUUC0sK4D-BJHGIx81WXrSjcS8PFYB98euxGhE,2716
+f3_data_models-0.3.8.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+f3_data_models-0.3.8.dist-info/RECORD,,

f3_data_models-0.3.7.dist-info/RECORD

@@ -1,7 +0,0 @@
-f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-f3_data_models/models.py,sha256=SLOXwM2BMnlGTwkVZfG3fM9hoksvPkcFRqzpEI4bm2Y,44293
-f3_data_models/testing.py,sha256=vetCEBQC8R1hf0TcH3-lINXdlHMVIcjC6OhVWiiFWU0,1204
-f3_data_models/utils.py,sha256=5Hg0f1cPMYc-URdTbDTLMiG9rCFN5NskJ4lUHw1a2NU,13747
-f3_data_models-0.3.7.dist-info/METADATA,sha256=F34OA9YQW-60PwJ77YytFIHNL_-zMlbew6t23Rrdfm4,2716
-f3_data_models-0.3.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-f3_data_models-0.3.7.dist-info/RECORD,,