fix toml and benchmarks

fractal-analytics-platform · Aug 28, 2024 · 50f237a · 50f237a
1 parent e53ec88
commit 50f237a
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 59 deletions.
diff --git a/benchmarks/populate_db/populate_db_script.py b/benchmarks/populate_db/populate_db_script.py
@@ -1,4 +1,4 @@
-from passlib.context import CryptContext
+from pwdlib import PasswordHash
 
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models.security import UserOAuth
@@ -38,7 +38,8 @@ def create_image_list(n_images: int) -> list:
 
 
 def create_first_user() -> None:
-    context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+
+    context = PasswordHash.recommended()
     hashed_password = context.hash(DEFAULT_CREDENTIALS["password"])
 
     user_db = UserOAuth(

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,11 +31,10 @@ sqlmodel = "^0.0.21"
 sqlalchemy = {extras = ["asyncio"], version = ">=2.0.23,<2.1"}
 aiosqlite = "^0.19.0"
 fastapi-users = {extras = ["oauth"], version = "^13.0.0"}
-pwdlib = {extras = ["argon2"], version = "0.2.0"}
+pwdlib = {extras = ["argon2", "bcrypt"], version = "^0.2.0"}
 alembic = "^1.13.1"
 uvicorn = "^0.29.0"
 pydantic = ">=1.10.8,<2"
-bcrypt = "^4.1.0"
 packaging = "^23.2"
 clusterfutures = "^0.5"
 cloudpickle = ">=3.0.0,<3.1.0"