From a5da416bc4840ed094bd1073a9b617b28bf75197 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 25 Sep 2023 15:54:55 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fix(users.py):=20add=20support?= =?UTF-8?q?=20for=20NEW=5FUSER=5FIS=5FACTIVE=20setting=20to=20determine=20?= =?UTF-8?q?if=20new=20users=20should=20be=20active=20by=20default=20?= =?UTF-8?q?=F0=9F=94=A7=20fix(cache/manager.py):=20add=20warning=20log=20m?= =?UTF-8?q?essage=20to=20inform=20users=20that=20RedisCache=20is=20experim?= =?UTF-8?q?ental=20and=20may=20not=20work=20as=20expected=20=F0=9F=94=A7?= =?UTF-8?q?=20fix(settings/auth.py):=20add=20NEW=5FUSER=5FIS=5FACTIVE=20se?= =?UTF-8?q?tting=20to=20determine=20if=20new=20users=20should=20be=20activ?= =?UTF-8?q?e=20by=20default?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/users.py | 5 +++-- src/backend/langflow/services/cache/manager.py | 7 ++++++- src/backend/langflow/services/settings/auth.py | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index a216a2051..ed85e148a 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -13,7 +13,7 @@ from sqlalchemy.exc import IntegrityError from sqlmodel import Session, select from fastapi import APIRouter, Depends, HTTPException -from langflow.services.getters import get_session +from langflow.services.getters import get_session, get_settings_service from langflow.services.auth.utils import ( get_current_active_superuser, get_current_active_user, @@ -32,6 +32,7 @@ router = APIRouter(tags=["Users"], prefix="/users") def add_user( user: UserCreate, session: Session = Depends(get_session), + settings_service=Depends(get_settings_service), ) -> User: """ Add a new user to the database. @@ -39,7 +40,7 @@ def add_user( new_user = User.from_orm(user) try: new_user.password = get_password_hash(user.password) - + new_user.is_active = settings_service.settings.NEW_USER_IS_ACTIVE session.add(new_user) session.commit() session.refresh(new_user) diff --git a/src/backend/langflow/services/cache/manager.py b/src/backend/langflow/services/cache/manager.py index b73908e51..19f5034cf 100644 --- a/src/backend/langflow/services/cache/manager.py +++ b/src/backend/langflow/services/cache/manager.py @@ -7,6 +7,8 @@ from langflow.services.cache.base import BaseCacheService import pickle +from loguru import logger + class InMemoryCache(BaseCacheService, Service): @@ -221,7 +223,10 @@ class RedisCache(BaseCacheService, Service): "RedisCache requires the redis-py package." " Please install Langflow with the deploy extra: pip install langflow[deploy]" ) from exc - + logger.warning( + "RedisCache is an experimental feature and may not work as expected." + " Please report any issues to our GitHub repository." + ) self._client = redis.StrictRedis(host=host, port=port, db=db) self.expiration_time = expiration_time diff --git a/src/backend/langflow/services/settings/auth.py b/src/backend/langflow/services/settings/auth.py index b6d288183..4a3eee100 100644 --- a/src/backend/langflow/services/settings/auth.py +++ b/src/backend/langflow/services/settings/auth.py @@ -35,6 +35,7 @@ class AuthSettings(BaseSettings): # If AUTO_LOGIN = True # > The application does not request login and logs in automatically as a super user. AUTO_LOGIN: bool = False + NEW_USER_IS_ACTIVE: bool = False SUPERUSER: str = DEFAULT_SUPERUSER SUPERUSER_PASSWORD: str = DEFAULT_SUPERUSER_PASSWORD