ecodev-core 0.0.29__tar.gz → 0.0.31__tar.gz

{ecodev_core-0.0.29 → ecodev_core-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ecodev-core
-Version: 0.0.29
+Version: 0.0.31
 Summary: Low level sqlmodel/fastapi/pydantic building blocks
 License: MIT
 Author: Thomas Epelbaum
@@ -45,6 +45,7 @@ Requires-Dist: pydantic-settings (>=2,<3)
 Requires-Dist: python-jose[cryptography] (>=3,<4)
 Requires-Dist: sqladmin (==0.15.2)
 Requires-Dist: sqlmodel (>=0,<1)
+Requires-Dist: uvicorn (==0.28.1)
 Requires-Dist: xlsxwriter (>=3,<4)
 Description-Content-Type: text/markdown
 

{ecodev_core-0.0.29 → ecodev_core-0.0.31}/ecodev_core/__init__.py

@@ -42,12 +42,15 @@ from ecodev_core.db_retrieval import get_rows
 from ecodev_core.db_retrieval import ServerSideField
 from ecodev_core.email_sender import send_email
 from ecodev_core.enum_utils import enum_converter
+from ecodev_core.list_utils import first_func_or_default
 from ecodev_core.list_utils import first_or_default
 from ecodev_core.list_utils import first_transformed_or_default
 from ecodev_core.list_utils import group_by
 from ecodev_core.list_utils import group_by_value
 from ecodev_core.list_utils import lselect
 from ecodev_core.list_utils import lselectfirst
+from ecodev_core.list_utils import sort_by_keys
+from ecodev_core.list_utils import sort_by_values
 from ecodev_core.logger import log_critical
 from ecodev_core.logger import logger_get
 from ecodev_core.pandas_utils import get_excelfile
@@ -85,4 +88,5 @@ __all__ = [
     'generic_insertion', 'custom_equal', 'is_authorized_user', 'get_method', 'AppActivity',
     'fastapi_monitor', 'dash_monitor', 'is_monitoring_user', 'get_recent_activities', 'select_user',
     'get_access_token', 'safe_get_user', 'backup', 'group_by', 'get_excelfile', 'upsert_new_user',
-    'datify', 'safe_drop_columns', 'get_value', 'is_null', 'send_email']
+    'datify', 'safe_drop_columns', 'get_value', 'is_null', 'send_email', 'first_func_or_default',
+    'sort_by_keys', 'sort_by_values']

{ecodev_core-0.0.29 → ecodev_core-0.0.31}/ecodev_core/db_connection.py

@@ -2,6 +2,8 @@
 Module implementing postgresql connection
 """
 from typing import Callable
+from typing import List
+from typing import Optional
 from urllib.parse import quote
 
 from pydantic_settings import BaseSettings
@@ -34,11 +36,17 @@ DB_URL = f'postgresql://{DB.db_username}:{_PASSWORD}@{DB.db_host}:{DB.db_port}/{
 engine = create_engine(DB_URL)
 
 
-def create_db_and_tables(model: Callable) -> None:
+def create_db_and_tables(model: Callable, excluded_tables: Optional[List[str]] = None) -> None:
     """
     Create all tables based on the declared schemas in core/models thanks to sqlmodel
+    Does not create the tables which are passed in the optional list of excluded tables,
+    must be the table names
     """
     log.info(f'Inserting on the fly {model} and all other domain tables')
+    SQLModel.metadata.tables = {table: meta_data for table, meta_data in
+                                SQLModel.metadata.__dict__.get('tables').items()
+                                if not excluded_tables or table
+                                not in excluded_tables}
     SQLModel.metadata.create_all(engine)
 
 

{ecodev_core-0.0.29 → ecodev_core-0.0.31}/ecodev_core/list_utils.py

@@ -45,6 +45,45 @@ def first_or_default(sequence: Union[List[Any], None],
     return next((elt for elt in sequence if condition(elt)), default)
 
 
+def sort_by_keys(unsorted_dict: dict, reverse: bool = False) -> dict:
+    """
+    Returns a sorted dictionary out of the passed unsorted_dict.
+    Sorting is done on unsorted_dict keys.
+    If reverse is True, reverse sorting
+    """
+    return dict(sorted(unsorted_dict.items(), reverse=reverse))
+
+
+def sort_by_values(unsorted_dict: dict, reverse: bool = False) -> dict:
+    """
+    Returns a sorted dictionary out of the passed unsorted_dict.
+    Sorting is done on unsorted_dict values.
+    If reverse is True, reverse sorting
+    """
+    return dict(sorted(unsorted_dict.items(), key=lambda item: item[1], reverse=reverse))
+
+
+def first_func_or_default(sequence: list[Callable] | None,
+                          elt: Any,
+                          condition: Callable | None = None,
+                          default: Any | None = None
+                          ) -> Any | None:
+    """
+    Returns the first element of a functional sequence if a certain criteria is met
+    or default value if the criteria is never met.
+    The criteria is like so:
+    - If no condition is provided, then
+      just check that func applied on elt is not None
+    - If a condition is provided, then
+       check that condition applied on func(elt) is not None
+    """
+    if not sequence:
+        return default
+
+    return next((func(elt) for func in sequence if (condition or (lambda x: x))(func(elt))),
+                default)
+
+
 def group_by(sequence: List[Any], key: Union[Callable, None]) -> Iterator[Tuple[Any, List[Any]]]:
     """
     Extension of itertools groupby method.

{ecodev_core-0.0.29 → ecodev_core-0.0.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ecodev-core"
-version = "0.0.29"
+version = "0.0.31"
 description = "Low level sqlmodel/fastapi/pydantic building blocks"
 authors = ["Thomas Epelbaum <tomepel@gmail.com>",
 					 "Olivier Gabriel <olivier.gabriel.geom@gmail.com>",
@@ -55,6 +55,7 @@ pydantic-settings = "~2"
 psycopg2-binary = "~2"
 openpyxl = "~3"
 xlsxwriter = "~3"
+uvicorn = "0.28.1"
 
 
 [build-system]