π OpenHands: AI-Driven Development
fix: handle nullable arguments in enterprise code (#14078)
Rohit Malhotrafb0108f946be
diff --git a/enterprise/integrations/github/data_collector.py b/enterprise/integrations/github/data_collector.pyindex 6d24399ddb..f05ca9246c 100644--- a/enterprise/integrations/github/data_collector.py+++ b/enterprise/integrations/github/data_collector.py@@ -429,6 +429,11 @@ class GitHubDataCollector:- Num openhands review comments"""pr_number = openhands_pr.pr_number+ if openhands_pr.installation_id is None:+ logger.warning(+ f'Skipping PR {openhands_pr.repo_name}#{pr_number}: missing installation_id'+ )+ returninstallation_id = int(openhands_pr.installation_id)repo_id = openhands_pr.repo_iddiff --git a/enterprise/integrations/stripe_service.py b/enterprise/integrations/stripe_service.pyindex 972636ab37..1e51c3d83f 100644--- a/enterprise/integrations/stripe_service.py+++ b/enterprise/integrations/stripe_service.py@@ -59,11 +59,11 @@ async def find_or_create_customer_by_user_id(user_id: str) -> dict | None:extra={'user_id': user_id, 'org_id': str(org.id)},)- # Create the customer in stripe- customer = await stripe.Customer.create_async(- email=org.contact_email,- metadata={'org_id': str(org.id)},- )+ # Create the customer in stripe (only include email if available)+ create_params: dict = {'metadata': {'org_id': str(org.id)}}+ if org.contact_email:+ create_params['email'] = org.contact_email+ customer = await stripe.Customer.create_async(**create_params)# Save the stripe customer in the local dbasync with a_session_maker() as session:@@ -108,11 +108,14 @@ async def migrate_customer(session, user_id: str, org: Org):if stripe_customer is None:returnstripe_customer.org_id = org.id- customer = await stripe.Customer.modify_async(- id=stripe_customer.stripe_customer_id,- email=org.contact_email,- metadata={'user_id': '', 'org_id': str(org.id)},- )+ # Only include email if available to avoid sending empty strings to Stripe+ modify_params: dict = {+ 'id': stripe_customer.stripe_customer_id,+ 'metadata': {'user_id': '', 'org_id': str(org.id)},+ }+ if org.contact_email:+ modify_params['email'] = org.contact_email+ customer = await stripe.Customer.modify_async(**modify_params)logger.info('migrated_customer',diff --git a/enterprise/server/routes/oauth_device.py b/enterprise/server/routes/oauth_device.pyindex d0c110df0e..88bc3fc953 100644--- a/enterprise/server/routes/oauth_device.py+++ b/enterprise/server/routes/oauth_device.py@@ -180,6 +180,18 @@ async def device_token(device_code: str = Form(...)):)if device_code_entry.status == 'authorized':+ # Verify user_id is set (should always be true for authorized status)+ if not device_code_entry.keycloak_user_id:+ logger.error(+ 'Authorized device code missing user_id',+ extra={'user_code': device_code_entry.user_code},+ )+ return _oauth_error(+ status.HTTP_500_INTERNAL_SERVER_ERROR,+ 'server_error',+ 'User identification missing',+ )+# Retrieve the specific API key for this device using the user_codeapi_key_store = ApiKeyStore.get_instance()device_key_name = f'{API_KEY_NAME} ({device_code_entry.user_code})'diff --git a/enterprise/storage/saas_conversation_store.py b/enterprise/storage/saas_conversation_store.pyindex fb76b0f571..13995e2a25 100644--- a/enterprise/storage/saas_conversation_store.py+++ b/enterprise/storage/saas_conversation_store.py@@ -4,10 +4,13 @@ import dataclassesimport loggingfrom dataclasses import dataclassfrom datetime import UTC+from typing import TYPE_CHECKING, Callable, ContextManagerfrom uuid import UUID-from sqlalchemy.orm import sessionmakerfrom storage.database import session_maker++if TYPE_CHECKING:+ from sqlalchemy.orm import Sessionfrom storage.stored_conversation_metadata import StoredConversationMetadatafrom storage.stored_conversation_metadata_saas import StoredConversationMetadataSaasfrom storage.user_store import UserStore@@ -31,14 +34,14 @@ logger = logging.getLogger(__name__)@dataclassclass SaasConversationStore(ConversationStore):user_id: str- session_maker: sessionmaker+ session_maker: Callable[[], ContextManager[Session]]org_id: UUID | None = None # will be fetched automaticallydef __init__(self,user_id: str,- org_id: UUID,- session_maker: sessionmaker,+ org_id: UUID | None,+ session_maker: Callable[[], ContextManager[Session]],resolver_org_id: UUID | None = None,):self.user_id = user_id