f3-data-models 0.4.4__tar.gz → 0.4.6__tar.gz

{f3_data_models-0.4.4 → f3_data_models-0.4.6}/PKG-INFO

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

f3_data_models-0.4.6/f3_data_models/testing.py

@@ -0,0 +1,27 @@
+from f3_data_models.models import Location
+from f3_data_models.utils import DbManager
+
+
+def test_update_event():
+    DbManager.update_record(
+        Location,
+        2,
+        {
+            "name": "The Beach",
+            "description": None,
+            "is_active": True,
+            "latitude": 22.0356,
+            "longitude": -159.3377,
+            "address_street": None,
+            "address_street2": None,
+            "address_city": None,
+            "address_state": None,
+            "address_zip": None,
+            "address_country": None,
+            "org_id": 5,
+        },
+    )
+
+
+if __name__ == "__main__":
+    test_update_event()

{f3_data_models-0.4.4 → f3_data_models-0.4.6}/f3_data_models/utils.py

@@ -10,7 +10,6 @@ from sqlalchemy import Select, and_, inspect, select
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import class_mapper, joinedload, sessionmaker
-from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.orm.collections import InstrumentedList
 from sqlalchemy_schemadisplay import create_schema_graph
 
@@ -158,9 +157,13 @@ class DbManager:
             relationships = mapper.relationships.keys()
             for attr, value in fields.items():
                 key = attr if isinstance(attr, str) else attr.key
+                print(f"key: {key}, value: {value}")
                 if hasattr(cls, key) and key not in relationships:
-                    if isinstance(attr, InstrumentedAttribute):
-                        setattr(record, key, value)
+                    setattr(record, key, value)
+                    # if isinstance(attr, InstrumentedAttribute):
+                    #     setattr(record, key, value)
+                    # else:
+                    #     setattr(record, key, value)
                 elif key in relationships:
                     # Handle relationships separately
                     relationship = mapper.relationships[key]
@@ -189,6 +192,7 @@ class DbManager:
                             session.add(related_record)
 
             try:
+                print(record)
                 session.commit()
             except pg8000.IntegrityError as e:
                 session.rollback()

{f3_data_models-0.4.4 → f3_data_models-0.4.6}/pyproject.toml

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

f3_data_models-0.4.4/f3_data_models/testing.py

@@ -1,13 +0,0 @@
-from f3_data_models.models import User
-from f3_data_models.utils import DbManager
-
-
-def test_update_event():
-    user = User(
-        email="evan.Petzoldt@protonmail.com",
-    )
-    DbManager.create_record(user)
-
-
-if __name__ == "__main__":
-    test_update_event()