ecodev-core 0.0.45__tar.gz → 0.0.47__tar.gz

{ecodev_core-0.0.45 → ecodev_core-0.0.47}/PKG-INFO

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

{ecodev_core-0.0.45 → ecodev_core-0.0.47}/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
@@ -22,6 +24,7 @@ from ecodev_core.version import Version
 BATCH_SIZE = 5000
 FILTER_ON = 'filter_on'
 INFO = 'info'
+SA_COLUMN_KWARGS = 'sa_column_kwargs'
 
 
 def sfield(**kwargs):
@@ -29,14 +32,26 @@ def sfield(**kwargs):
     Field constructor for columns not to be versioned. Those are the columns on which to select.
     They morally are a sort of unique identifier of a row (like id but more business meaningful)
     """
-    return Field(**kwargs, sa_column_kwargs={INFO: {FILTER_ON: True}})
+    sa_column_kwargs = _get_sa_column_kwargs(kwargs, sfield=True)
+    return Field(**kwargs, sa_column_kwargs=sa_column_kwargs)
 
 
 def field(**kwargs):
     """
     Field constructor for columns to be versioned.
     """
-    return Field(**kwargs, sa_column_kwargs={INFO: {FILTER_ON: False}})
+    sa_column_kwargs = _get_sa_column_kwargs(kwargs, sfield=False)
+    return Field(**kwargs, sa_column_kwargs=sa_column_kwargs)
+
+
+def _get_sa_column_kwargs(kwargs, sfield: bool) -> dict:
+    """
+    Combine existing sa_column_kwargs with the new field necessary for versioning
+    """
+    if not (additional_vals := kwargs.get(SA_COLUMN_KWARGS)):
+        return {INFO: {FILTER_ON: sfield}}
+    kwargs.pop(SA_COLUMN_KWARGS)
+    return additional_vals | {INFO: {FILTER_ON: sfield}}
 
 
 def upsert_selector(values: SQLModel, db_schema: SQLModelMetaclass) -> SelectOfScalar:
@@ -65,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.45 → ecodev_core-0.0.47}/ecodev_core/version.py

@@ -38,7 +38,7 @@ class Version(SQLModel, table=True):  # type: ignore
     Attributes are:
         - table: the table to version
         - column: the column of table to version
-        - row_id: the the row id of the column of table to version
+        - row_id: the row id of the column of table to version
         - col_type: the column type
         - value: the value to store (previous row/column/table version)
     """
@@ -97,15 +97,15 @@ def _col_type_to_db(col_type: type | EnumType) -> ColType:
     """
     Forge ColType out of passed col_type
     """
-    if col_type == int:
+    if issubclass(int, col_type):
         return ColType.INT
-    if col_type == bool:
+    if issubclass(bool, col_type):
         return ColType.BOOL
-    if col_type == float:
+    if issubclass(float, col_type):
         return ColType.FLOAT
-    if col_type == str:
+    if issubclass(str, col_type):
         return ColType.STR
-    if col_type == datetime:
+    if issubclass(datetime, col_type):
         return ColType.DATE
     return ColType.ENUM
 

{ecodev_core-0.0.45 → ecodev_core-0.0.47}/pyproject.toml

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