Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix: revert get_user_by_id_async to use sync session_maker (#12610)

Hiep Le29b77be807e0
diff --git a/enterprise/storage/user_store.py b/enterprise/storage/user_store.py
index 767f5a94a1..ca30612285 100644
--- a/enterprise/storage/user_store.py
+++ b/enterprise/storage/user_store.py
@@ -14,9 +14,9 @@ from server.constants import (
get_default_litellm_model,
)
from server.logger import logger
-from sqlalchemy import select, text
+from sqlalchemy import text
from sqlalchemy.orm import joinedload
-from storage.database import a_session_maker, session_maker
+from storage.database import session_maker
from storage.encrypt_utils import decrypt_legacy_model
from storage.org import Org
from storage.org_member import OrgMember
@@ -372,13 +372,13 @@ class UserStore:
This is the preferred method when calling from an async context as it
avoids event loop conflicts that can occur with the sync version.
"""
- async with a_session_maker() as session:
- result = await session.execute(
- select(User)
+ with session_maker() as session:
+ user = (
+ session.query(User)
.options(joinedload(User.org_members))
.filter(User.id == uuid.UUID(user_id))
+ .first()
)
- user = result.scalars().first()
if user:
return user
@@ -392,22 +392,23 @@ class UserStore:
await asyncio.sleep(_RETRY_LOAD_DELAY_SECONDS)
# Check for user again as migration could have happened while trying to get the lock.
- result = await session.execute(
- select(User)
+ user = (
+ session.query(User)
.options(joinedload(User.org_members))
.filter(User.id == uuid.UUID(user_id))
+ .first()
)
- user = result.scalars().first()
if user:
return user
- result = await session.execute(
- select(UserSettings).filter(
+ user_settings = (
+ session.query(UserSettings)
+ .filter(
UserSettings.keycloak_user_id == user_id,
UserSettings.already_migrated.is_(False),
)
+ .first()
)
- user_settings = result.scalars().first()
if user_settings:
token_manager = TokenManager()
user_info = await token_manager.get_user_info_from_user_id(user_id)