Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Fix mypy type errors in enterprise/server/auth and clustered_conversation_manager (#13210)

Rohit Malhotra3bf019b045be
diff --git a/enterprise/server/auth/saas_user_auth.py b/enterprise/server/auth/saas_user_auth.py
index 8064c70cbd..216486b493 100644
--- a/enterprise/server/auth/saas_user_auth.py
+++ b/enterprise/server/auth/saas_user_auth.py
@@ -119,13 +119,12 @@ class SaasUserAuth(UserAuth):
self._settings = settings
return settings
- async def get_secrets_store(self):
+ async def get_secrets_store(self) -> SaasSecretsStore:
logger.debug('saas_user_auth_get_secrets_store')
secrets_store = self.secrets_store
if secrets_store:
return secrets_store
- user_id = await self.get_user_id()
- secrets_store = SaasSecretsStore(user_id, get_config())
+ secrets_store = SaasSecretsStore(self.user_id, get_config())
self.secrets_store = secrets_store
return secrets_store
@@ -211,8 +210,7 @@ class SaasUserAuth(UserAuth):
settings_store = self.settings_store
if settings_store:
return settings_store
- user_id = await self.get_user_id()
- settings_store = SaasSettingsStore(user_id, get_config())
+ settings_store = SaasSettingsStore(self.user_id, get_config())
self.settings_store = settings_store
return settings_store
diff --git a/enterprise/server/clustered_conversation_manager.py b/enterprise/server/clustered_conversation_manager.py
index b8b6e04b63..ee10e37246 100644
--- a/enterprise/server/clustered_conversation_manager.py
+++ b/enterprise/server/clustered_conversation_manager.py
@@ -749,6 +749,9 @@ class ClusteredConversationManager(StandaloneConversationManager):
config = load_openhands_config()
settings_store = await SaasSettingsStore.get_instance(config, user_id)
settings = await settings_store.load()
+ if not settings:
+ logger.error(f'Failed to load settings for user {user_id}')
+ return
await self.maybe_start_agent_loop(conversation_id, settings, user_id)
async def _start_agent_loop(