π OpenHands: AI-Driven Development
Fix mypy type errors in enterprise/storage/ (#13204)
Rohit Malhotraab02c73c7cd2
diff --git a/enterprise/server/routes/api_keys.py b/enterprise/server/routes/api_keys.pyindex a543d333e3..d5f30f87cf 100644--- a/enterprise/server/routes/api_keys.py+++ b/enterprise/server/routes/api_keys.py@@ -66,22 +66,15 @@ async def generate_byor_key(user_id: str) -> str | None:{'type': 'byor'},)- if key:- logger.info(- 'Successfully generated new BYOR key',- extra={- 'user_id': user_id,- 'key_length': len(key) if key else 0,- 'key_prefix': key[:10] + '...' if key and len(key) > 10 else key,- },- )- return key- else:- logger.error(- 'Failed to generate BYOR LLM API key - no key in response',- extra={'user_id': user_id},- )- return None+ logger.info(+ 'Successfully generated new BYOR key',+ extra={+ 'user_id': user_id,+ 'key_length': len(key),+ 'key_prefix': key[:10] + '...' if len(key) > 10 else key,+ },+ )+ return keyexcept Exception as e:logger.exception('Error generating BYOR key',diff --git a/enterprise/storage/lite_llm_manager.py b/enterprise/storage/lite_llm_manager.pyindex fc45fb2271..49af669359 100644--- a/enterprise/storage/lite_llm_manager.py+++ b/enterprise/storage/lite_llm_manager.py@@ -316,14 +316,13 @@ class LiteLlmManager:get_openhands_cloud_key_alias(keycloak_user_id, org_id),None,)- if new_key:- logger.info(- 'LiteLlmManager:migrate_lite_llm_entries:generated_new_key',- extra={'org_id': org_id, 'user_id': keycloak_user_id},- )- # Update user_settings with the new key so it gets stored in org_member- user_settings.llm_api_key = SecretStr(new_key)- user_settings.llm_api_key_for_byor = SecretStr(new_key)+ logger.info(+ 'LiteLlmManager:migrate_lite_llm_entries:generated_new_key',+ extra={'org_id': org_id, 'user_id': keycloak_user_id},+ )+ # Update user_settings with the new key so it gets stored in org_member+ user_settings.llm_api_key = SecretStr(new_key)+ user_settings.llm_api_key_for_byor = SecretStr(new_key)logger.info('LiteLlmManager:migrate_lite_llm_entries:complete',@@ -1051,10 +1050,9 @@ class LiteLlmManager:team_id: str | None,key_alias: str | None,metadata: dict | None,- ) -> str | None:+ ) -> str:if LITE_LLM_API_KEY is None or LITE_LLM_API_URL is None:- logger.warning('LiteLLM API configuration not found')- return None+ raise ValueError('LiteLLM API configuration not found')json_data: dict[str, Any] = {'user_id': keycloak_user_id,'models': [],diff --git a/enterprise/storage/offline_token_store.py b/enterprise/storage/offline_token_store.pyindex 5fa09fa985..28101d4e24 100644--- a/enterprise/storage/offline_token_store.py+++ b/enterprise/storage/offline_token_store.py@@ -51,10 +51,10 @@ class OfflineTokenStore:@classmethodasync def get_instance(- cls, config: OpenHandsConfig, user_id: str+ cls,+ config: OpenHandsConfig,+ user_id: str, # type: ignore[override]) -> OfflineTokenStore:"""Get an instance of the OfflineTokenStore."""logger.debug(f'offline_token_store.get_instance::{user_id}')- if user_id:- user_id = str(user_id)return OfflineTokenStore(user_id, config)diff --git a/enterprise/storage/saas_conversation_store.py b/enterprise/storage/saas_conversation_store.pyindex b8ac843e13..1c9580969e 100644--- a/enterprise/storage/saas_conversation_store.py+++ b/enterprise/storage/saas_conversation_store.py@@ -231,11 +231,12 @@ class SaasConversationStore(ConversationStore):@classmethodasync def get_instance(- cls, config: OpenHandsConfig, user_id: str | None+ cls,+ config: OpenHandsConfig,+ user_id: str, # type: ignore[override]) -> ConversationStore:- # user_id should not be None in SaaS, should we raise?# Use async version since callers now use asyncio.run_coroutine_threadsafe()# to dispatch to the main event loop where asyncpg connections work properly.user = await UserStore.get_user_by_id(user_id)org_id = user.current_org_id if user else None- return SaasConversationStore(str(user_id), org_id, session_maker)+ return SaasConversationStore(user_id, org_id, session_maker)diff --git a/enterprise/storage/saas_secrets_store.py b/enterprise/storage/saas_secrets_store.pyindex 3b2820485b..aede6df419 100644--- a/enterprise/storage/saas_secrets_store.py+++ b/enterprise/storage/saas_secrets_store.py@@ -133,9 +133,7 @@ class SaasSecretsStore(SecretsStore):async def get_instance(cls,config: OpenHandsConfig,- user_id: str | None,+ user_id: str, # type: ignore[override]) -> SaasSecretsStore:- if not user_id:- raise Exception('SaasSecretsStore cannot be constructed with no user_id')logger.debug(f'saas_secrets_store.get_instance::{user_id}')return SaasSecretsStore(user_id, config)diff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.pyindex bd43fa1a7a..b2fa3cff26 100644--- a/enterprise/storage/saas_settings_store.py+++ b/enterprise/storage/saas_settings_store.py@@ -8,6 +8,7 @@ from dataclasses import dataclassfrom cryptography.fernet import Fernetfrom pydantic import SecretStr+from server.auth.token_manager import TokenManagerfrom server.constants import LITE_LLM_API_URLfrom server.logger import loggerfrom sqlalchemy import select@@ -74,7 +75,7 @@ class SaasSettingsStore(SettingsStore):return Noneorg_id = user.current_org_id- org_member: OrgMember = None+ org_member: OrgMember | None = Nonefor om in user.org_members:if om.org_id == org_id:org_member = om@@ -138,14 +139,26 @@ class SaasSettingsStore(SettingsStore):self.user_id, new_session)if user_settings:- user = await UserStore.migrate_user(self.user_id, user_settings)+ token_manager = TokenManager()+ user_info = await token_manager.get_user_info_from_user_id(+ self.user_id+ )+ if not user_info:+ logger.error(f'User info not found for ID {self.user_id}')+ return None+ user = await UserStore.migrate_user(+ self.user_id, user_settings, user_info+ )+ if not user:+ logger.error(f'Failed to migrate user {self.user_id}')+ return Noneelse:logger.error(f'User not found for ID {self.user_id}')return Noneorg_id = user.current_org_id- org_member: OrgMember = None+ org_member: OrgMember | None = Nonefor om in user.org_members:if om.org_id == org_id:org_member = om@@ -246,7 +259,6 @@ class SaasSettingsStore(SettingsStore):org_id,openhands_type=openhands_type,):- generated_key = Noneif openhands_type:generated_key = await LiteLlmManager.generate_key(self.user_id,@@ -265,14 +277,8 @@ class SaasSettingsStore(SettingsStore):None,)- if generated_key:- item.llm_api_key = SecretStr(generated_key)- logger.info(- 'saas_settings_store:store:generated_openhands_key',- extra={'user_id': self.user_id},- )- else:- logger.warning(- 'saas_settings_store:store:failed_to_generate_openhands_key',- extra={'user_id': self.user_id},- )+ item.llm_api_key = SecretStr(generated_key)+ logger.info(+ 'saas_settings_store:store:generated_openhands_key',+ extra={'user_id': self.user_id},+ )diff --git a/enterprise/storage/user_store.py b/enterprise/storage/user_store.pyindex 4f55d8650c..f5d1c9d27a 100644--- a/enterprise/storage/user_store.py+++ b/enterprise/storage/user_store.py@@ -1,6 +1,4 @@-"""-Store class for managing users.-"""+"""Store class for managing users."""import asyncioimport uuid@@ -160,10 +158,7 @@ class UserStore:user_id: str,user_settings: UserSettings,user_info: dict,- ) -> User:- if not user_id or not user_settings:- return None-+ ) -> User | None:kwargs = decrypt_legacy_model(['llm_api_key',@@ -374,8 +369,7 @@ class UserStore:@staticmethodasync def downgrade_user(user_id: str) -> UserSettings | None:- """- This method can be removed once orgs is established - probably after Feb 15 2026+ """This method can be removed once orgs is established - probably after Feb 15 2026Downgrade a migrated user back to the pre-migration state.This reverses the migrate_user operation:@@ -678,6 +672,12 @@ class UserStore:if user_settings:token_manager = TokenManager()user_info = await token_manager.get_user_info_from_user_id(user_id)+ if not user_info:+ logger.warning(+ 'user_store:get_user_by_id:failed_to_get_user_info',+ extra={'user_id': user_id},+ )+ return Noneuser = await UserStore.migrate_user(user_id,user_settings,@@ -889,12 +889,14 @@ class UserStore:from openhands.storage.data_models.settings import Settings- settings = Settings(language='en', enable_proactive_conversation_starters=True)+ default_settings = Settings(+ language='en', enable_proactive_conversation_starters=True+ )from storage.lite_llm_manager import LiteLlmManagersettings = await LiteLlmManager.create_entries(- org_id, user_id, settings, create_user+ org_id, user_id, default_settings, create_user)if not settings:logger.info(@@ -1017,8 +1019,7 @@ class UserStore:def _has_custom_settings(user_settings: UserSettings, old_user_version: int | None) -> bool:- """- Check if user has custom LLM settings that should be preserved.+ """Check if user has custom LLM settings that should be preserved.Returns True if user customized either model or base_url.Args:diff --git a/enterprise/tests/unit/test_lite_llm_manager.py b/enterprise/tests/unit/test_lite_llm_manager.pyindex 9b1f53a6b0..04ca2347fc 100644--- a/enterprise/tests/unit/test_lite_llm_manager.py+++ b/enterprise/tests/unit/test_lite_llm_manager.py@@ -1353,9 +1353,13 @@ class TestLiteLlmManager:result1 = await LiteLlmManager._get_team(mock_client, 'team_id')result2 = await LiteLlmManager._get_user(mock_client, 'user_id')- result3 = await LiteLlmManager._generate_key(- mock_client, 'user_id', 'team_id', 'alias', {}- )+ # _generate_key raises ValueError when config is missing+ with pytest.raises(+ ValueError, match='LiteLLM API configuration not found'+ ):+ await LiteLlmManager._generate_key(+ mock_client, 'user_id', 'team_id', 'alias', {}+ )result4 = await LiteLlmManager._get_user_team_info(mock_client, 'user_id', 'team_id')@@ -1366,7 +1370,6 @@ class TestLiteLlmManager:# Methods that return None when config is missingassert result1 is Noneassert result2 is None- assert result3 is Noneassert result4 is Noneassert result5 is None