ecodev-core 0.0.55__py3-none-any.whl → 0.0.57__py3-none-any.whl

ecodev_core/__init__.py

@@ -19,6 +19,7 @@ from ecodev_core.authentication import get_current_user
 from ecodev_core.authentication import get_user
 from ecodev_core.authentication import is_admin_user
 from ecodev_core.authentication import is_authorized_user
+from ecodev_core.authentication import is_banned
 from ecodev_core.authentication import is_monitoring_user
 from ecodev_core.authentication import JwtAuth
 from ecodev_core.authentication import safe_get_user
@@ -110,4 +111,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', 'add_missing_enum_values', 'ban_token', 'TokenBanlist']
+    'SETTINGS', 'add_missing_enum_values', 'ban_token', 'TokenBanlist', 'is_banned']

ecodev_core/authentication.py

@@ -159,7 +159,7 @@ def is_authorized_user(token: str = Depends(SCHEME)) -> bool:
     """
     Check if the passed token corresponds to an authorized user
     """
-    if _is_banned(token):
+    if is_banned(token):
         return False
 
     try:
@@ -184,7 +184,7 @@ def get_user(token: str = Depends(SCHEME),
     """
     Retrieves (if it exists) the db user corresponding to the passed token
     """
-    if _is_banned(token):
+    if is_banned(token):
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=REVOKED_TOKEN,
                             headers={'WWW-Authenticate': 'Bearer'})
     if user := get_current_user(token, tfa_value, tfa_check):
@@ -201,7 +201,7 @@ def ban_token(token: str, session: Session) -> None:
     session.commit()
 
 
-def _is_banned(token: str) -> bool:
+def is_banned(token: str) -> bool:
     """
     Check if the passed token is banned.
 
@@ -232,7 +232,7 @@ def is_admin_user(token: str = Depends(SCHEME)) -> AppUser:
     """
     Retrieves (if it exists) the admin (meaning who has valid credentials) user from the db
     """
-    if _is_banned(token):
+    if is_banned(token):
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=REVOKED_TOKEN,
                             headers={'WWW-Authenticate': 'Bearer'})
 
@@ -246,7 +246,7 @@ def is_monitoring_user(token: str = Depends(SCHEME)) -> AppUser:
     """
     Retrieves (if it exists) the monitoring user from the db
     """
-    if _is_banned(token):
+    if is_banned(token):
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=REVOKED_TOKEN,
                             headers={'WWW-Authenticate': 'Bearer'})
 

ecodev_core/db_connection.py

@@ -36,7 +36,7 @@ _PASSWORD = quote(SETTINGS_DB.db_password or DB.db_password, safe='')
 _USER, _HOST = SETTINGS_DB.db_username or DB.db_username, SETTINGS_DB.db_host or DB.db_host
 _PORT, _NAME = SETTINGS_DB.db_port or DB.db_port, SETTINGS_DB.db_name or DB.db_name
 DB_URL = f'postgresql://{_USER}:{_PASSWORD}@{_HOST}:{_PORT}/{_NAME}'
-engine = create_engine(DB_URL)
+engine = create_engine(DB_URL, pool_pre_ping=True)
 
 
 def create_db_and_tables(model: Callable, excluded_tables: Optional[List[str]] = None) -> None:

{ecodev_core-0.0.55.dist-info → ecodev_core-0.0.57.dist-info}/METADATA

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

{ecodev_core-0.0.55.dist-info → ecodev_core-0.0.57.dist-info}/RECORD

@@ -1,13 +1,13 @@
-ecodev_core/__init__.py,sha256=xS1h7Xtp-LBGeKkxFfJFqyxeBiznow7c1MPNAeYLtOg,6218
+ecodev_core/__init__.py,sha256=K3mOMR75omZcvKBb_ki2upUZ2VjntJFXUoGZdOzUHJQ,6280
 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
 ecodev_core/auth_configuration.py,sha256=qZ1Dkk7n1AH7w0tVKQ8AYswukOeMZH6mmbixPEAQnJ8,764
-ecodev_core/authentication.py,sha256=HuA8o_A_jjnTzG6NKqIeh5LP1tb0yyCR1RvXcPy2Xks,11559
+ecodev_core/authentication.py,sha256=JJz_ezjCEBz_RGwFYyPzZHnM6pyk3rLOcKxkV5UESjA,11554
 ecodev_core/backup.py,sha256=N5AtoqtHJRp92Bj0Nr7WW5WDcpjTIET8haxZoYDOtyI,3890
 ecodev_core/check_dependencies.py,sha256=aFn8GI4eBbuJT8RxsfhSSnlpNYYj_LPOH-tZF0EqfKQ,6917
 ecodev_core/custom_equal.py,sha256=2gRn0qpyJ8-Kw9GQSueu0nLngLrRrwyMPlP6zqPac0U,899
-ecodev_core/db_connection.py,sha256=hhqeyTrl0DlQA7RkUs6pIOpZeE3yS_Q5mqj5uGPfG_Y,2569
+ecodev_core/db_connection.py,sha256=scur99ohLM4Mt931-1RAQh8b6YqFyyMMFkzz8eCxdik,2589
 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
@@ -27,7 +27,7 @@ ecodev_core/settings.py,sha256=UvaTv8S_HvfFAL-m1Rfqv_geSGcccuV3ziR1o1d5wu4,1795
 ecodev_core/sqlmodel_utils.py,sha256=t57H3QPtKRy4ujic1clMK_2L4p0yjGJLZbDjHPZ8M94,453
 ecodev_core/token_banlist.py,sha256=rKXG9QkfCpjOTr8gBgdX-KYNHAkKvQ9TRnGS99VC9Co,491
 ecodev_core/version.py,sha256=eyIf8KkW_t-hMuYFIoy0cUlNaMewLe6i45m2HKZKh0Q,4403
-ecodev_core-0.0.55.dist-info/LICENSE.md,sha256=8dqVJEbwXjPWjjRKjdLMym5k9Gi8hwtrHh84sti6KIs,1068
-ecodev_core-0.0.55.dist-info/METADATA,sha256=JBynrhYq46elNowZb9yfgMTyjedizyKOpiLyGqLhEp8,3510
-ecodev_core-0.0.55.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ecodev_core-0.0.55.dist-info/RECORD,,
+ecodev_core-0.0.57.dist-info/LICENSE.md,sha256=8dqVJEbwXjPWjjRKjdLMym5k9Gi8hwtrHh84sti6KIs,1068
+ecodev_core-0.0.57.dist-info/METADATA,sha256=xMi1SiUT_urXt1X8WSGnXgbaYgeVG00DvzBjqrLgfCc,3510
+ecodev_core-0.0.57.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ecodev_core-0.0.57.dist-info/RECORD,,