ecodev-core 0.0.52__tar.gz → 0.0.53__tar.gz

{ecodev_core-0.0.52 → ecodev_core-0.0.53}/PKG-INFO

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

{ecodev_core-0.0.52 → ecodev_core-0.0.53}/ecodev_core/__init__.py

@@ -40,6 +40,7 @@ from ecodev_core.db_insertion import get_raw_df
 from ecodev_core.db_retrieval import count_rows
 from ecodev_core.db_retrieval import get_rows
 from ecodev_core.db_retrieval import ServerSideField
+from ecodev_core.db_upsertion import add_missing_enum_values
 from ecodev_core.db_upsertion import field
 from ecodev_core.db_upsertion import filter_to_sfield_dict
 from ecodev_core.db_upsertion import get_sfield_columns
@@ -107,4 +108,4 @@ __all__ = [
     'sort_by_keys', 'sort_by_values', 'Settings', 'load_yaml_file', 'Deployment', 'Version',
     'sfield', 'field', 'upsert_df_data', 'upsert_deletor', 'get_row_versions', 'get_versions',
     'db_to_value', 'upsert_data', 'upsert_selector', 'get_sfield_columns', 'filter_to_sfield_dict',
-    'SETTINGS']
+    'SETTINGS', 'add_missing_enum_values']

{ecodev_core-0.0.52 → ecodev_core-0.0.53}/ecodev_core/db_upsertion.py

@@ -2,6 +2,7 @@
 Module handling CRUD and version operations
 """
 from datetime import datetime
+from enum import EnumType
 from functools import partial
 from typing import Any
 from typing import Union
@@ -14,6 +15,7 @@ from sqlmodel import inspect
 from sqlmodel import select
 from sqlmodel import Session
 from sqlmodel import SQLModel
+from sqlmodel import text
 from sqlmodel import update
 from sqlmodel.main import SQLModelMetaclass
 from sqlmodel.sql.expression import SelectOfScalar
@@ -27,6 +29,31 @@ INFO = 'info'
 SA_COLUMN_KWARGS = 'sa_column_kwargs'
 
 
+def add_missing_enum_values(enum: EnumType, session: Session, new_vals: list | None = None) -> None:
+    """
+    Add to an existing enum its missing db values. Do so by retrieving what is already in db, and
+    insert what is new
+    """
+
+    for val in [e.name for e in new_vals or enum if e.name not in get_enum_values(enum, session)]:
+        session.execute(text(f"ALTER TYPE {enum.__name__.lower()} ADD VALUE IF NOT EXISTS '{val}'"))
+        session.commit()
+
+
+def get_enum_values(enum: EnumType, session: Session) -> set[str]:
+    """
+    Return all enum values in db for the passed enum.
+    """
+    result = session.execute(text(
+        """
+        SELECT enumlabel FROM pg_enum
+        JOIN pg_type ON pg_enum.enumtypid = pg_type.oid
+        WHERE pg_type.typname = :enum_name
+        """
+    ), {'enum_name': enum.__name__.lower()})
+    return {x[0] for x in result}
+
+
 def sfield(**kwargs):
     """
     Field constructor for columns not to be versioned. Those are the columns on which to select.
@@ -147,11 +174,11 @@ def get_sfield_columns(db_model: SQLModelMetaclass) -> list[str]:
         for x in inspect(db_model).c
         if x.info.get(FILTER_ON) is True
     ]
-    
-    
-def filter_to_sfield_dict(row: dict | SQLModelMetaclass, 
-                           db_schema: SQLModelMetaclass | None = None) \
-                              -> dict[str, dict | SQLModelMetaclass]:
+
+
+def filter_to_sfield_dict(row: dict | SQLModelMetaclass,
+                          db_schema: SQLModelMetaclass | None = None) \
+        -> dict[str, dict | SQLModelMetaclass]:
     """
     Returns a dict with only sfields from object
     Args:
@@ -162,4 +189,3 @@ def filter_to_sfield_dict(row: dict | SQLModelMetaclass,
     """
     return {pk: getattr(row, pk)
             for pk in get_sfield_columns(db_schema or row.__class__)}
-    

{ecodev_core-0.0.52 → ecodev_core-0.0.53}/pyproject.toml

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