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

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

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

{ecodev_core-0.0.44 → ecodev_core-0.0.45}/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.45}/ecodev_core/db_upsertion.py

@@ -83,24 +83,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.45}/pyproject.toml

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