π OpenHands: AI-Driven Development
fix: correct return types and remove unreachable code (SQLAlchemy typing PR6) (#14079)
Rohit Malhotracd0175d83ef5
diff --git a/enterprise/server/utils/saas_app_conversation_info_injector.py b/enterprise/server/utils/saas_app_conversation_info_injector.pyindex 373cf47168..e99cd8e87c 100644--- a/enterprise/server/utils/saas_app_conversation_info_injector.py+++ b/enterprise/server/utils/saas_app_conversation_info_injector.py@@ -350,8 +350,8 @@ class SaasSQLAppConversationInfoService(SQLAppConversationInfoService):# Convert string user_id to UUIDuser_id_uuid = UUID(user_id_str)user_query = select(User).where(User.id == user_id_uuid)- result = await self.db_session.execute(user_query)- user = result.scalar_one_or_none()+ user_result = await self.db_session.execute(user_query)+ user = user_result.scalar_one_or_none()assert user# Determine org_id: prefer API key's org_id if authenticated via API key@@ -372,8 +372,8 @@ class SaasSQLAppConversationInfoService(SQLAppConversationInfoService):saas_query = select(StoredConversationMetadataSaas).where(StoredConversationMetadataSaas.conversation_id == str(info.id))- result = await self.db_session.execute(saas_query)- existing_saas_metadata = result.scalar_one_or_none()+ saas_result = await self.db_session.execute(saas_query)+ existing_saas_metadata = saas_result.scalar_one_or_none()assert existing_saas_metadata is None or (existing_saas_metadata.user_id == user_id_uuidand existing_saas_metadata.org_id == org_iddiff --git a/enterprise/server/verified_models/verified_model_service.py b/enterprise/server/verified_models/verified_model_service.pyindex f4ca03ce7a..80cc605d2c 100644--- a/enterprise/server/verified_models/verified_model_service.py+++ b/enterprise/server/verified_models/verified_model_service.py@@ -138,7 +138,8 @@ class VerifiedModelService:))result = await self.db_session.execute(query)- return result.scalars().first()+ stored = result.scalars().first()+ return verified_model(stored) if stored else Noneasync def create_verified_model(self,diff --git a/enterprise/storage/gitlab_webhook_store.py b/enterprise/storage/gitlab_webhook_store.pyindex e6f9279c74..76b62e78bd 100644--- a/enterprise/storage/gitlab_webhook_store.py+++ b/enterprise/storage/gitlab_webhook_store.py@@ -25,6 +25,8 @@ class GitlabWebhookStore:if webhook.group_id:return (GitLabResourceType.GROUP, webhook.group_id)+ # At this point, project_id must be set (we checked at least one is set above)+ assert webhook.project_id is not Nonereturn (GitLabResourceType.PROJECT, webhook.project_id)async def store_webhooks(self, project_details: list[GitlabWebhook]) -> None:diff --git a/enterprise/storage/lite_llm_manager.py b/enterprise/storage/lite_llm_manager.pyindex 022f6e46f6..2f8e56e3ff 100644--- a/enterprise/storage/lite_llm_manager.py+++ b/enterprise/storage/lite_llm_manager.py@@ -402,9 +402,7 @@ class LiteLlmManager:extra={'org_id': org_id, 'user_id': keycloak_user_id},)# Update user_settings with the new key so it gets stored in org_member- # agent_settings is a JSON column (dict) on UserSettings- if user_settings.agent_settings is None:- user_settings.agent_settings = {}+ # agent_settings is a non-nullable JSON column (dict) on UserSettingsuser_settings.agent_settings.setdefault('llm', {})['api_key'] = new_keydiff --git a/enterprise/storage/org_app_settings_store.py b/enterprise/storage/org_app_settings_store.pyindex 9cc185672c..52308b3f9b 100644--- a/enterprise/storage/org_app_settings_store.py+++ b/enterprise/storage/org_app_settings_store.py@@ -35,10 +35,10 @@ class OrgAppSettingsStore:Org: The organization object, or None if not found"""# Get user with their current_org_id- result = await self.db_session.execute(+ user_result = await self.db_session.execute(select(User).filter(User.id == UUID(user_id)))- user = result.scalars().first()+ user = user_result.scalars().first()if not user:return None@@ -48,8 +48,8 @@ class OrgAppSettingsStore:return None# Get the organization- result = await self.db_session.execute(select(Org).filter(Org.id == org_id))- org = result.scalars().first()+ org_result = await self.db_session.execute(select(Org).filter(Org.id == org_id))+ org = org_result.scalars().first()if not org:return Nonediff --git a/enterprise/storage/saas_secrets_store.py b/enterprise/storage/saas_secrets_store.pyindex f4fb310556..14d1fb524c 100644--- a/enterprise/storage/saas_secrets_store.py+++ b/enterprise/storage/saas_secrets_store.py@@ -60,13 +60,11 @@ class SaasSecretsStore(SecretsStore):async with a_session_maker() as session:# Incoming secrets are always the most updated ones# Delete existing records for this user AND organization only+ # Note: user.current_org_id is non-nullable, so org_id is always setdelete_query = delete(StoredCustomSecrets).filter(- StoredCustomSecrets.keycloak_user_id == self.user_id+ StoredCustomSecrets.keycloak_user_id == self.user_id,+ StoredCustomSecrets.org_id == org_id,)- if org_id is not None:- delete_query = delete_query.filter(StoredCustomSecrets.org_id == org_id)- else:- delete_query = delete_query.filter(StoredCustomSecrets.org_id.is_(None))await session.execute(delete_query)# Prepare the new secrets data