ecodev-core 0.0.19__tar.gz → 0.0.21__tar.gz

{ecodev_core-0.0.19 → ecodev_core-0.0.21}/PKG-INFO

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

{ecodev_core-0.0.19 → ecodev_core-0.0.21}/ecodev_core/__init__.py

@@ -10,7 +10,6 @@ from ecodev_core.app_rights import AppRight
 from ecodev_core.app_user import AppUser
 from ecodev_core.app_user import select_user
 from ecodev_core.app_user import upsert_app_users
-from ecodev_core.app_user import upsert_new_user
 from ecodev_core.auth_configuration import AUTH
 from ecodev_core.authentication import attempt_to_log
 from ecodev_core.authentication import get_access_token
@@ -24,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
@@ -61,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',
@@ -79,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', 'upsert_new_user']
+    'get_access_token', 'safe_get_user', 'backup', 'group_by', 'get_excelfile', 'upsert_new_user',
+    'datify']

{ecodev_core-0.0.19 → ecodev_core-0.0.21}/ecodev_core/app_user.py

@@ -90,13 +90,3 @@ def select_user(username: str, session: Session) -> AppUser:
         sqlalchemy.exc.MultipleResultsFound: Should normally never be an issue.
     """
     return session.exec(select(AppUser).where(col(AppUser.user) == username)).one()
-
-
-def upsert_new_user(user_id: int, user: str, session: Session, password: str = '') -> None:
-    """
-    Upsert a new user if not already present in db
-    """
-    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()

{ecodev_core-0.0.19 → ecodev_core-0.0.21}/ecodev_core/authentication.py

@@ -221,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

{ecodev_core-0.0.19 → ecodev_core-0.0.21}/ecodev_core/backup.py

@@ -34,13 +34,13 @@ BCK = BackUpSettings()
 BACKUP_URL = f'ftp://{BCK.backup_username}:{BCK.backup_password}@{BCK.backup_url}'
 
 
-def backup(backed_folder: Path, nb_saves: int = 5) -> None:
+def backup(backed_folder: Path, nb_saves: int = 5, additional_id: str = 'default') -> None:
     """
     Backup db and backed_folder: write the dump/tar on the backup server and erase old copies
     """
     timestamp = datetime.now().strftime('%Y_%m_%d_%Hh_%Mmn_%Ss')
-    _backup_db(Path.cwd() / f'db.{timestamp}.dump', nb_saves)
-    _backup_files(backed_folder, Path.cwd() / f'files.{timestamp}.tgz', nb_saves)
+    _backup_db(Path.cwd() / f'{additional_id}_db.{timestamp}.dump', nb_saves)
+    _backup_files(backed_folder, Path.cwd() / f'{additional_id}_files.{timestamp}.tgz', nb_saves)
 
 
 def _backup_db(db_dump_path: Path, nb_saves: int) -> None:

{ecodev_core-0.0.19 → ecodev_core-0.0.21}/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.19 → ecodev_core-0.0.21}/pyproject.toml

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