ecodev-core 0.0.46__tar.gz → 0.0.48__tar.gz

{ecodev_core-0.0.46 → ecodev_core-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ecodev-core
-Version: 0.0.46
+Version: 0.0.48
 Summary: Low level sqlmodel/fastapi/pydantic building blocks
 License: MIT
 Author: Thomas Epelbaum

{ecodev_core-0.0.46 → ecodev_core-0.0.48}/ecodev_core/db_upsertion.py

@@ -1,7 +1,9 @@
 """
 Module handling CRUD and version operations
 """
+from datetime import datetime
 from functools import partial
+from typing import Any
 from typing import Union
 
 import pandas as pd
@@ -78,12 +80,20 @@ def upsert_updator(values: SQLModel,
     col_types = {x: y.annotation for x, y in db_schema.__fields__.items()}
     table = db_schema.__tablename__
 
-    for col, val in {k: v for k, v in db.items() if k in to_update and v != to_update[k]}.items():
+    for col, val in {k: v for k, v in db.items() if k in to_update and _value_comparator(
+            v, to_update[k])}.items():
         session.add(Version.from_table_row(table, col, row_id, col_types[col], val))
 
     return update(db_schema).where(db_schema.id == row_id).values(**to_update)
 
 
+def _value_comparator(v: Any, to_update: Any) -> bool:
+    """
+    Performs a comparison between the value in db and the value to be upserted
+    """
+    return v.date() != to_update.date() if isinstance(v, datetime) else v != to_update
+
+
 def upsert_deletor(values: SQLModel, session: Session):
     """
     Delete row in db corresponding to the passed values, selecting on columns not to be versioned.

{ecodev_core-0.0.46 → ecodev_core-0.0.48}/ecodev_core/version.py

@@ -135,10 +135,10 @@ def db_to_value(db_value: str | None, col_type: type | EnumType) -> COL_TYPES:
     """
     if db_value is None:
         return None
-    if col_type in [int, str, float]:
+    if issubclass(int, col_type) or issubclass(str, col_type) or issubclass(float, col_type):
         return col_type(db_value)
-    if col_type == bool:
-        return True if db_value == 'True' else False
-    if col_type == datetime:
+    if issubclass(bool, col_type):
+        return db_value == 'True'
+    if issubclass(datetime, col_type):
         return datetime.strptime(db_value, '%Y-%m-%d %H:%M:%S.%f')
     return col_type[db_value]   # type: ignore[index]

{ecodev_core-0.0.46 → ecodev_core-0.0.48}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ecodev-core"
-version = "0.0.46"
+version = "0.0.48"
 description = "Low level sqlmodel/fastapi/pydantic building blocks"
 authors = ["Thomas Epelbaum <tomepel@gmail.com>",
 					 "Olivier Gabriel <olivier.gabriel.geom@gmail.com>",