Refactor code and optimize imports
This commit is contained in:
parent
796854d9e6
commit
b1a4957e20
1 changed files with 9 additions and 6 deletions
|
|
@ -2,9 +2,10 @@ from langflow.services.auth.utils import create_super_user, verify_password
|
|||
from langflow.services.database.utils import initialize_database
|
||||
from langflow.services.manager import service_manager
|
||||
from langflow.services.schema import ServiceType
|
||||
from langflow.services.settings.constants import DEFAULT_SUPERUSER, DEFAULT_SUPERUSER_PASSWORD
|
||||
from langflow.services.settings.constants import (DEFAULT_SUPERUSER,
|
||||
DEFAULT_SUPERUSER_PASSWORD)
|
||||
from loguru import logger
|
||||
from sqlmodel import Session
|
||||
from sqlmodel import Session, select
|
||||
|
||||
from .deps import get_db_service, get_session, get_settings_service
|
||||
|
||||
|
|
@ -15,7 +16,8 @@ def get_factories_and_deps():
|
|||
from langflow.services.chat import factory as chat_factory
|
||||
from langflow.services.credentials import factory as credentials_factory
|
||||
from langflow.services.database import factory as database_factory
|
||||
from langflow.services.session import factory as session_service_factory # type: ignore
|
||||
from langflow.services.session import \
|
||||
factory as session_service_factory # type: ignore
|
||||
from langflow.services.settings import factory as settings_factory
|
||||
from langflow.services.store import factory as store_factory
|
||||
from langflow.services.task import factory as task_factory
|
||||
|
|
@ -48,7 +50,7 @@ def get_factories_and_deps():
|
|||
def get_or_create_super_user(session: Session, username, password, is_default):
|
||||
from langflow.services.database.models.user.model import User
|
||||
|
||||
user = session.query(User).filter(User.username == username).first()
|
||||
user = session.exec(select(User).where(User.username == username)).first()
|
||||
|
||||
if user and user.is_superuser:
|
||||
return None # Superuser already exists
|
||||
|
|
@ -131,7 +133,7 @@ def teardown_superuser(settings_service, session):
|
|||
username = DEFAULT_SUPERUSER
|
||||
from langflow.services.database.models.user.model import User
|
||||
|
||||
user = session.query(User).filter(User.username == username).first()
|
||||
user = session.exec(select(User).where(User.username == username)).first()
|
||||
if user and user.is_superuser:
|
||||
session.delete(user)
|
||||
session.commit()
|
||||
|
|
@ -171,7 +173,8 @@ def initialize_session_service():
|
|||
Initialize the session manager.
|
||||
"""
|
||||
from langflow.services.cache import factory as cache_factory
|
||||
from langflow.services.session import factory as session_service_factory # type: ignore
|
||||
from langflow.services.session import \
|
||||
factory as session_service_factory # type: ignore
|
||||
|
||||
initialize_settings_service()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue