ecodev-core 0.0.18__py3-none-any.whl → 0.0.20__py3-none-any.whl

ecodev_core/__init__.py

@@ -23,6 +23,7 @@ from ecodev_core.authentication import JwtAuth
 from ecodev_core.authentication import safe_get_user
 from ecodev_core.authentication import SCHEME
 from ecodev_core.authentication import Token
+from ecodev_core.authentication import upsert_new_user
 from ecodev_core.backup import backup
 from ecodev_core.check_dependencies import check_dependencies
 from ecodev_core.check_dependencies import compute_dependencies
@@ -60,13 +61,13 @@ from ecodev_core.read_write import load_json_file
 from ecodev_core.read_write import make_dir
 from ecodev_core.read_write import write_json_file
 from ecodev_core.safe_utils import boolify
+from ecodev_core.safe_utils import datify
 from ecodev_core.safe_utils import floatify
 from ecodev_core.safe_utils import intify
 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
-
 __all__ = [
     'AUTH', 'Token', 'get_app_services', 'attempt_to_log', 'get_current_user', 'is_admin_user',
     'write_json_file', 'load_json_file', 'make_dir', 'check_dependencies', 'compute_dependencies',
@@ -78,4 +79,5 @@ __all__ = [
     'enum_converter', 'ServerSideFilter', 'get_rows', 'count_rows', 'ServerSideField', 'get_raw_df',
     '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']
+    'get_access_token', 'safe_get_user', 'backup', 'group_by', 'get_excelfile', 'upsert_new_user',
+    'datify']

ecodev_core/app_user.py

@@ -2,7 +2,7 @@
 Module implementing the sqlmodel orm part of the user table
 """
 from pathlib import Path
-from typing import Dict
+from typing import Any
 from typing import List
 from typing import Optional
 from typing import TYPE_CHECKING
@@ -39,7 +39,7 @@ class AppUser(SQLModel, table=True):  # type: ignore
     rights: List['AppRight'] = Relationship(back_populates='user')
 
 
-def user_convertor(df: pd.DataFrame) -> List[Dict]:
+def user_convertor(df: pd.DataFrame) -> List[Any]:
     """
     Dummy user convertor
     """

ecodev_core/authentication.py

@@ -93,20 +93,23 @@ class JwtAuth(AuthenticationBackend):
             request.session.update(token)
         return True if token else False
 
-    @staticmethod
-    def authorized(form: Any):
+    def authorized(self, form: Any):
         """
         Check that the user information contained in the form corresponds to an admin user
         """
         with Session(engine) as session:
             try:
-                token = attempt_to_log(form.get('username', ''), form.get('password', ''), session)
-                if is_admin_user(token['access_token']):
-                    return token
-                return None
+                return self.admin_token(form, session)
             except HTTPException:
                 return None
 
+    def admin_token(self, form: Any, session: Session) -> Union[Dict[str, str], None]:
+        """
+        Unsafe attempt to retrieve the token, only return it if admin rights
+        """
+        token = attempt_to_log(form.get('username', ''), form.get('password', ''), session)
+        return token if is_admin_user(token['access_token']) else None
+
     async def logout(self, request: Request) -> bool:
         """
         Logout procedure: clears the cache
@@ -218,6 +221,20 @@ def is_monitoring_user(token: str = Depends(SCHEME)) -> AppUser:
                         detail=MONITORING_ERROR, headers={'WWW-Authenticate': 'Bearer'})
 
 
+def upsert_new_user(token: str, user: str, password: str = '') -> None:
+    """
+    Upsert a new user if not already present in db.
+
+    NB: this method RAISES a http error if he token is invalid
+    """
+    user_id = _verify_access_token(token).id
+    with Session(engine) as session:
+        if not session.exec(select(AppUser).where(col(AppUser.id) == user_id)).first():
+            session.add(AppUser(user=user, password=password, permission=Permission.Consultant,
+                                id=user_id))
+            session.commit()
+
+
 def _create_access_token(data: Dict, tfa_value: Optional[str] = None) -> str:
     """
     Create an access token out of the passed data. Only called if credentials are valid
@@ -262,4 +279,3 @@ def _check_password(plain_password: Optional[str], hashed_password: str) -> bool
     Check the passed password (compare it to the passed encoded one).
     """
     return CONTEXT.verify(plain_password, hashed_password)
-

ecodev_core/safe_utils.py

@@ -4,6 +4,7 @@ This boilerplate code is not to be touched under any circumstances.
 """
 import contextlib
 import shutil
+from datetime import datetime
 from pathlib import Path
 from typing import Any
 from typing import Callable
@@ -170,6 +171,13 @@ def floatify(x: Union[str, float]) -> Union[float, None]:
     return _transformify(x, float)
 
 
+def datify(date: str, date_format: str) -> Union[datetime, None]:
+    """
+    Safe conversion to a date format
+    """
+    return _transformify(date, lambda x: datetime.strptime(x, date_format))
+
+
 def _transformify(x: Union[Any, float], transformation: Callable) -> Union[Any, None]:
     """
     Safe conversion of a (Any, np.nan) value into a (Any,None) one thanks to transformation

{ecodev_core-0.0.18.dist-info → ecodev_core-0.0.20.dist-info}/METADATA

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

{ecodev_core-0.0.18.dist-info → ecodev_core-0.0.20.dist-info}/RECORD

@@ -1,9 +1,9 @@
-ecodev_core/__init__.py,sha256=BT9IRxEoI6GcvRx9Ldjo2JFLAshQ7OdSwHX8zDqMK5w,4368
+ecodev_core/__init__.py,sha256=LssQSv0CD5SyuHK07j-0i_Dgawj-6tZghtzsnHTwpX0,4497
 ecodev_core/app_activity.py,sha256=_rU5uPfttHxXX5IaCuTA7K9We5w2qluJ3Xpf6i12HhY,3763
 ecodev_core/app_rights.py,sha256=RZPdDtydFqc_nFj96huKAc56BS0qS6ScKv4Kghqd6lc,726
-ecodev_core/app_user.py,sha256=qXvu0GOm2fAY_KxjkPEUIw7Rb9uxm2kvyFvcTTBQvEg,2949
+ecodev_core/app_user.py,sha256=r1bqA4H08x53XmxmjwyGKl_PFjYQazzBbVErdkztqeE,2947
 ecodev_core/auth_configuration.py,sha256=ZjEB-N5HTo2jaEljwrh6q64Lh5qZ1NuKk8bbpIEcdYc,433
-ecodev_core/authentication.py,sha256=GLAYKuu-im7iGTI-pOrC-M-qSQBqz8JV0ayS_0yrAeE,9556
+ecodev_core/authentication.py,sha256=XL_hPRw_jd1jFxASFmxB1GJqCeg8zY8S8GFt2Y1XoGE,10278
 ecodev_core/backup.py,sha256=9YZ79LkbLMSSoBJFmTr8u9_OPBbDmwasrmCJpqb7lkg,3055
 ecodev_core/check_dependencies.py,sha256=aFn8GI4eBbuJT8RxsfhSSnlpNYYj_LPOH-tZF0EqfKQ,6917
 ecodev_core/custom_equal.py,sha256=2gRn0qpyJ8-Kw9GQSueu0nLngLrRrwyMPlP6zqPac0U,899
@@ -18,8 +18,8 @@ ecodev_core/pandas_utils.py,sha256=bkobhqj_tWrFCgBGQwPJLwN59HJunNDeBKhnctWCUBE,1
 ecodev_core/permissions.py,sha256=dMaRQyjrF8Y51gkbkFvFsGVdzQGLZtA72IQ7REYamxg,320
 ecodev_core/pydantic_utils.py,sha256=e3GH50JmcpTmd2UgrB94QSwWOlOCW3WIlVdyX9C4T-U,741
 ecodev_core/read_write.py,sha256=auJ5bBJTVGkLRkiP_vZxVCX64B0Y-9qpsaDhovHmbas,996
-ecodev_core/safe_utils.py,sha256=uTHzLnKBoV_MiFsI65X-WYmgzLpIBH5Cio80KSLd6wg,5933
-ecodev_core-0.0.18.dist-info/LICENSE.md,sha256=jebQDe1ib9LAODuNvcSoo2CoqS6P0_q8--mMTICh_kI,1074
-ecodev_core-0.0.18.dist-info/METADATA,sha256=9KQl9pnlTiCgaAh4jLWvoH1kzzILU8dJ-Jm4_BG_lLA,3291
-ecodev_core-0.0.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ecodev_core-0.0.18.dist-info/RECORD,,
+ecodev_core/safe_utils.py,sha256=JCfxo6fcznjsL-XHNJ1TKo1UvfJB83WT5jpTFmtJwsE,6160
+ecodev_core-0.0.20.dist-info/LICENSE.md,sha256=jebQDe1ib9LAODuNvcSoo2CoqS6P0_q8--mMTICh_kI,1074
+ecodev_core-0.0.20.dist-info/METADATA,sha256=RR6vZTi-k2VBUXggrp2_aXNDZ5j73oGsn3LiVwuv6AA,3291
+ecodev_core-0.0.20.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ecodev_core-0.0.20.dist-info/RECORD,,