ecodev-core 0.0.51__py3-none-any.whl → 0.0.53__py3-none-any.whl

ecodev_core/__init__.py

@@ -40,14 +40,15 @@ 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
 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_df_data
 from ecodev_core.db_upsertion import upsert_selector
-from ecodev_core.db_upsertion import get_sfield_columns
-from ecodev_core.db_upsertion import filter_to_sfield_dict
 from ecodev_core.deployment import Deployment
 from ecodev_core.email_sender import send_email
 from ecodev_core.enum_utils import enum_converter
@@ -85,6 +86,7 @@ from ecodev_core.safe_utils import safe_clt
 from ecodev_core.safe_utils import SafeTestCase
 from ecodev_core.safe_utils import SimpleReturn
 from ecodev_core.safe_utils import stringify
+from ecodev_core.settings import SETTINGS
 from ecodev_core.settings import Settings
 from ecodev_core.version import db_to_value
 from ecodev_core.version import get_row_versions
@@ -105,4 +107,5 @@ __all__ = [
     '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_df_data', 'upsert_deletor', 'get_row_versions', 'get_versions',
-    'db_to_value', 'upsert_data', 'upsert_selector', 'get_sfield_columns', 'filter_to_sfield_dict']
+    'db_to_value', 'upsert_data', 'upsert_selector', 'get_sfield_columns', 'filter_to_sfield_dict',
+    'SETTINGS', 'add_missing_enum_values']

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/settings.py

@@ -10,11 +10,8 @@ from pydantic_settings import SettingsConfigDict
 
 from ecodev_core.deployment import Deployment
 from ecodev_core.list_utils import dict_to_class
-from ecodev_core.logger import logger_get
 from ecodev_core.read_write import load_yaml_file
 
-log = logger_get(__name__)
-
 
 class DeploymentSetting(BaseSettings):
     """
@@ -43,9 +40,7 @@ class Settings:
          information coming from a secret file.
         """
         self.deployment = deployment
-
         with suppress(FileNotFoundError):
-            log.info((base_path / 'config' / f'{deployment.value}.yaml').exists())
             data = load_yaml_file(base_path / 'config' / f'{deployment.value}.yaml')
             if (secrets_file := base_path / 'secrets' / f'{deployment.value}.yaml').exists():
                 data = deep_update(data, load_yaml_file(secrets_file))

{ecodev_core-0.0.51.dist-info → ecodev_core-0.0.53.dist-info}/METADATA

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

{ecodev_core-0.0.51.dist-info → ecodev_core-0.0.53.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ecodev_core/__init__.py,sha256=YsvkU4bKXgYW_0jWVx0Z7_31UUQCxfADcVRxR-CcaxI,5943
+ecodev_core/__init__.py,sha256=UgK7wYtjjqjhAN772FlxiY16FkwvjbBdKUgAFGKggBs,6089
 ecodev_core/app_activity.py,sha256=KBtI-35LBLPDppFB7xjxWthXQrY3Z_aGDnC-HrW8Ea0,4641
 ecodev_core/app_rights.py,sha256=RZPdDtydFqc_nFj96huKAc56BS0qS6ScKv4Kghqd6lc,726
 ecodev_core/app_user.py,sha256=r1bqA4H08x53XmxmjwyGKl_PFjYQazzBbVErdkztqeE,2947
@@ -11,7 +11,7 @@ ecodev_core/db_connection.py,sha256=hhqeyTrl0DlQA7RkUs6pIOpZeE3yS_Q5mqj5uGPfG_Y,
 ecodev_core/db_filters.py,sha256=T_5JVF27UEu7sC6NOm7-W3_Y0GLfbWQO_EeTXcD2cv8,5041
 ecodev_core/db_insertion.py,sha256=k-r798MMrW1sRb-gb8lQTxyJrb4QP5iZT8GDzCYYwlo,4544
 ecodev_core/db_retrieval.py,sha256=sCP7TDGIcTOK5gT3Inga91bE4S31HbQPw4yI22WJbss,7392
-ecodev_core/db_upsertion.py,sha256=_OdCILP1NEw1hkbvTn9ZOF5YkU9U02Fj_U3E7uY5AoI,5861
+ecodev_core/db_upsertion.py,sha256=Pdu_LkcgePygICM3flfOIADHbL_NRUOC6WqAh-p3YcI,6757
 ecodev_core/deployment.py,sha256=z8ACI00EtKknXOB8xyPwYIXTvPjIDOH9z9cBGEU0YrA,281
 ecodev_core/email_sender.py,sha256=V3UGweuq6Iy09Z9to8HzM6JOVDVGHZXHGjUSkW94Tac,1912
 ecodev_core/enum_utils.py,sha256=BkQ4YQ97tXBYmMcQiSIi0mbioD5CgVU79myg1BBAXuA,556
@@ -23,10 +23,10 @@ ecodev_core/permissions.py,sha256=WAx-ilMu8LlQp2sjJVdkhNQieytEaEm8577ZF1HWeTY,50
 ecodev_core/pydantic_utils.py,sha256=e3GH50JmcpTmd2UgrB94QSwWOlOCW3WIlVdyX9C4T-U,741
 ecodev_core/read_write.py,sha256=YIGRERvFHU7vy-JIaCWAza4CPMysLRUHKJxN-ZgFmu0,1208
 ecodev_core/safe_utils.py,sha256=Q8N15El1tSxZJJsy1i_1CCycuBN1_98QQoHmYJRcLIY,6904
-ecodev_core/settings.py,sha256=ucN370enphetG3LIOC7uHV8qYo4rlx4neYuHnpxSKNI,1949
+ecodev_core/settings.py,sha256=UvaTv8S_HvfFAL-m1Rfqv_geSGcccuV3ziR1o1d5wu4,1795
 ecodev_core/sqlmodel_utils.py,sha256=t57H3QPtKRy4ujic1clMK_2L4p0yjGJLZbDjHPZ8M94,453
 ecodev_core/version.py,sha256=eyIf8KkW_t-hMuYFIoy0cUlNaMewLe6i45m2HKZKh0Q,4403
-ecodev_core-0.0.51.dist-info/LICENSE.md,sha256=8dqVJEbwXjPWjjRKjdLMym5k9Gi8hwtrHh84sti6KIs,1068
-ecodev_core-0.0.51.dist-info/METADATA,sha256=DGtUqB01Nbk_oAkGNYY20AbtrWBC3xfrpdH_SYVxL1c,3509
-ecodev_core-0.0.51.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ecodev_core-0.0.51.dist-info/RECORD,,
+ecodev_core-0.0.53.dist-info/LICENSE.md,sha256=8dqVJEbwXjPWjjRKjdLMym5k9Gi8hwtrHh84sti6KIs,1068
+ecodev_core-0.0.53.dist-info/METADATA,sha256=J57EVk_FfORxTLvYXjn7KLrN8p98J0K4C8tMGyixab4,3509
+ecodev_core-0.0.53.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ecodev_core-0.0.53.dist-info/RECORD,,