modified lfx.deps.py and langflow.services.utils.py

Author: Bharani0012

src/backend/base/langflow/services/utils.py

@@ -22,13 +22,13 @@
 if TYPE_CHECKING:
     from lfx.services.settings.manager import SettingsService
     from sqlmodel.ext.asyncio.session import AsyncSession
-``
 
 async def get_or_create_super_user(session: AsyncSession, username, password, is_default):
     from langflow.services.database.models.user.model import User
 
     stmt = select(User).where(User.username == username)
-    result = await session.exec(stmt)    user = result.first()
+    result = await session.exec(stmt)    
+    user = result.first()
 
     if user and user.is_superuser:
         return None  # Superuser already exists
@@ -287,7 +287,7 @@ async def initialize_services(*, fix_migration: bool = False) -> None:
     await initialize_database(fix_migration=fix_migration)
     db_service = get_db_service(use_organisation=False)
     await db_service.initialize_alembic_log_file()
-    async with session_scope() as session:
+    async with session_scope(use_organisation=False) as session:
         settings_service = get_service(ServiceType.SETTINGS_SERVICE)
         await setup_superuser(settings_service, session)
     try:

src/lfx/src/lfx/services/deps.py

@@ -10,6 +10,8 @@
 from lfx.services.schema import ServiceType
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncGenerator
+    from sqlmodel.ext.asyncio.session import AsyncSession
     from lfx.services.interfaces import (
         CacheServiceProtocol,
         ChatServiceProtocol,
@@ -52,10 +54,15 @@ def get_service(service_type: ServiceType, default=None):
         return None
 
 
-def get_db_service() -> DatabaseServiceProtocol | None:
+def get_db_service(*, use_organisation: bool = True) -> DatabaseServiceProtocol | None:
     """Retrieves the database service instance."""
     from lfx.services.schema import ServiceType
 
+    from langflow.services.database.organisation import OrganizationService
+
+    if use_organisation and get_settings_service().auth_settings.CLERK_AUTH_ENABLED:
+        return OrganizationService.get_db_service_for_request()
+
     return get_service(ServiceType.DATABASE_SERVICE)
 
 
@@ -102,13 +109,13 @@ def get_tracing_service() -> TracingServiceProtocol | None:
 
 
 @asynccontextmanager
-async def session_scope():
+async def session_scope(*, use_organisation: bool = True) -> AsyncGenerator[AsyncSession, None]:
     """Session scope context manager.
 
     Returns a real session if database service is available, otherwise a NoopSession.
     This ensures code can always call session methods without None checking.
     """
-    db_service = get_db_service()
+    db_service = get_db_service(use_organisation=use_organisation)
     if db_service is None or inspect.isabstract(type(db_service)):
         from lfx.services.session import NoopSession