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

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

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

{ecodev_core-0.0.44 → ecodev_core-0.0.46}/ecodev_core/__init__.py

@@ -44,7 +44,7 @@ from ecodev_core.db_upsertion import field
 from ecodev_core.db_upsertion import sfield
 from ecodev_core.db_upsertion import upsert_data
 from ecodev_core.db_upsertion import upsert_deletor
-from ecodev_core.db_upsertion import upsert_dict_data
+from ecodev_core.db_upsertion import upsert_df_data
 from ecodev_core.db_upsertion import upsert_selector
 from ecodev_core.deployment import Deployment
 from ecodev_core.email_sender import send_email
@@ -102,5 +102,5 @@ __all__ = [
     'get_access_token', 'safe_get_user', 'backup', 'group_by', 'get_excelfile', 'upsert_new_user',
     'datify', 'safe_drop_columns', 'get_value', 'is_null', 'send_email', 'first_func_or_default',
     'sort_by_keys', 'sort_by_values', 'Settings', 'load_yaml_file', 'Deployment', 'Version',
-    'sfield', 'field', 'upsert_data', 'upsert_deletor', 'get_row_versions', 'get_versions',
-    'db_to_value', 'upsert_dict_data', 'upsert_selector']
+    'sfield', 'field', 'upsert_df_data', 'upsert_deletor', 'get_row_versions', 'get_versions',
+    'db_to_value', 'upsert_data', 'upsert_selector']

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

@@ -22,6 +22,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 +30,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:
@@ -83,24 +96,27 @@ def upsert_deletor(values: SQLModel, session: Session):
         session.commit()
 
 
-def upsert_data(df: Union[pd.DataFrame], db_schema: SQLModelMetaclass, session: Session) -> None:
+def upsert_df_data(df: Union[pd.DataFrame], db_schema: SQLModelMetaclass, session: Session) -> None:
     """
     Upsert the passed df into db_schema db.
     """
-    upsert_dict_data([x.to_dict() for _, x in df.iterrows()], db_schema, session)
+    upsert_data([x.to_dict() for _, x in df.iterrows()], session, raw_db_schema=db_schema)
 
 
-def upsert_dict_data(data: list[dict], db_schema: SQLModelMetaclass, session: Session) -> None:
+def upsert_data(data: list[dict | SQLModelMetaclass],
+                session: Session,
+                raw_db_schema: SQLModelMetaclass | None = None) -> None:
     """
     Upsert the passed list of dicts (corresponding to db_schema) into db_schema db.
     """
+    db_schema = raw_db_schema or data[0].__class__
     selector = partial(upsert_selector, db_schema=db_schema)
     updator = partial(upsert_updator, db_schema=db_schema)
     batches = [data[i:i + BATCH_SIZE] for i in range(0, len(data), BATCH_SIZE)]
 
     for batch in progressbar.progressbar(batches, redirect_stdout=False):
         for row in batch:
-            new_object = db_schema(**row)
+            new_object = db_schema(**row) if isinstance(row, dict) else row
             if in_db := session.exec(selector(new_object)).first():
                 session.exec(updator(new_object, in_db.id, session))
             else:

{ecodev_core-0.0.44 → ecodev_core-0.0.46}/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.44 → ecodev_core-0.0.46}/pyproject.toml

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