Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix(backend): inherit organization llm settings for new members (#13330)

Hiep Ledebbaae38597
diff --git a/enterprise/server/services/org_invitation_service.py b/enterprise/server/services/org_invitation_service.py
index 5c4edcd1e4..fbed399520 100644
--- a/enterprise/server/services/org_invitation_service.py
+++ b/enterprise/server/services/org_invitation_service.py
@@ -365,14 +365,12 @@ class OrgInvitationService:
'Failed to set up organization access. Please try again.'
)
- # Step 5: Add user to organization
- from storage.org_member_store import OrgMemberStore as OMS
-
- org_member_kwargs = OMS.get_kwargs_from_settings(settings)
- # Don't override with org defaults - use invitation-specified role
- org_member_kwargs.pop('llm_model', None)
- org_member_kwargs.pop('llm_base_url', None)
+ # Step 4.5: Fetch organization to get its LLM settings
+ org = await OrgStore.get_org_by_id(invitation.org_id)
+ if not org:
+ raise InvitationInvalidError('Organization not found')
+ # Step 5: Add user to organization with inherited org LLM settings
# Get the llm_api_key as string (it's SecretStr | None in Settings)
llm_api_key = (
settings.llm_api_key.get_secret_value() if settings.llm_api_key else ''
@@ -384,6 +382,9 @@ class OrgInvitationService:
role_id=invitation.role_id,
llm_api_key=llm_api_key,
status='active',
+ llm_model=org.default_llm_model,
+ llm_base_url=org.default_llm_base_url,
+ max_iterations=org.default_max_iterations,
)
# Step 6: Mark invitation as accepted
diff --git a/enterprise/storage/org_member_store.py b/enterprise/storage/org_member_store.py
index 1f32c2e8b5..bc4c5878cd 100644
--- a/enterprise/storage/org_member_store.py
+++ b/enterprise/storage/org_member_store.py
@@ -28,6 +28,9 @@ class OrgMemberStore:
role_id: int,
llm_api_key: str,
status: Optional[str] = None,
+ llm_model: Optional[str] = None,
+ llm_base_url: Optional[str] = None,
+ max_iterations: Optional[int] = None,
) -> OrgMember:
"""Add a user to an organization with a specific role."""
async with a_session_maker() as session:
@@ -37,6 +40,9 @@ class OrgMemberStore:
role_id=role_id,
llm_api_key=llm_api_key,
status=status,
+ llm_model=llm_model,
+ llm_base_url=llm_base_url,
+ max_iterations=max_iterations,
)
session.add(org_member)
await session.commit()
diff --git a/enterprise/storage/saas_settings_store.py b/enterprise/storage/saas_settings_store.py
index d2fe4104e0..d062ff6e7e 100644
--- a/enterprise/storage/saas_settings_store.py
+++ b/enterprise/storage/saas_settings_store.py
@@ -187,6 +187,18 @@ class SaasSettingsStore(SettingsStore):
if hasattr(model, key):
setattr(model, key, value)
+ # Map Settings fields to Org fields with 'default_' prefix
+ # The generic loop above doesn't update these because Org uses
+ # 'default_llm_model' not 'llm_model', etc.
+ # Use exclude_unset to only update explicitly-set fields (allows clearing with null)
+ settings_data = item.model_dump(exclude_unset=True)
+ if 'llm_model' in settings_data:
+ org.default_llm_model = settings_data['llm_model']
+ if 'llm_base_url' in settings_data:
+ org.default_llm_base_url = settings_data['llm_base_url']
+ if 'max_iterations' in settings_data:
+ org.default_max_iterations = settings_data['max_iterations']
+
# Propagate LLM settings to all org members
# This ensures all members see the same LLM configuration when an admin saves
# Note: Concurrent saves by multiple admins will result in last-write-wins.
diff --git a/enterprise/tests/unit/test_org_invitation_service.py b/enterprise/tests/unit/test_org_invitation_service.py
index c12b50f8e7..89cbcd9844 100644
--- a/enterprise/tests/unit/test_org_invitation_service.py
+++ b/enterprise/tests/unit/test_org_invitation_service.py
@@ -98,6 +98,11 @@ class TestAcceptInvitationEmailValidation:
mock_keycloak_user_info = {'email': '[email protected]'} # Email from Keycloak
+ mock_org = MagicMock()
+ mock_org.default_llm_model = 'test-model'
+ mock_org.default_llm_base_url = None
+ mock_org.default_max_iterations = None
+
with (
patch(
'server.services.org_invitation_service.OrgInvitationStore.get_invitation_by_token',
@@ -121,6 +126,10 @@ class TestAcceptInvitationEmailValidation:
'server.services.org_invitation_service.OrgService.create_litellm_integration',
new_callable=AsyncMock,
) as mock_create_litellm,
+ patch(
+ 'server.services.org_invitation_service.OrgStore.get_org_by_id',
+ new_callable=AsyncMock,
+ ) as mock_get_org,
patch(
'server.services.org_invitation_service.OrgMemberStore.add_user_to_org',
new_callable=AsyncMock,
@@ -145,6 +154,7 @@ class TestAcceptInvitationEmailValidation:
mock_settings = MagicMock()
mock_settings.llm_api_key = SecretStr('test-key')
mock_create_litellm.return_value = mock_settings
+ mock_get_org.return_value = mock_org
mock_update_status.return_value = mock_invitation
# Act - should not raise error because Keycloak email matches
@@ -214,6 +224,11 @@ class TestAcceptInvitationEmailValidation:
mock_invitation.email = '[email protected]' # Lowercase in invitation
+ mock_org = MagicMock()
+ mock_org.default_llm_model = 'test-model'
+ mock_org.default_llm_base_url = None
+ mock_org.default_max_iterations = None
+
with (
patch(
'server.services.org_invitation_service.OrgInvitationStore.get_invitation_by_token',
@@ -234,6 +249,10 @@ class TestAcceptInvitationEmailValidation:
'server.services.org_invitation_service.OrgService.create_litellm_integration',
new_callable=AsyncMock,
) as mock_create_litellm,
+ patch(
+ 'server.services.org_invitation_service.OrgStore.get_org_by_id',
+ new_callable=AsyncMock,
+ ) as mock_get_org,
patch(
'server.services.org_invitation_service.OrgMemberStore.add_user_to_org',
new_callable=AsyncMock,
@@ -250,6 +269,7 @@ class TestAcceptInvitationEmailValidation:
mock_settings = MagicMock()
mock_settings.llm_api_key = SecretStr('test-key')
mock_create_litellm.return_value = mock_settings
+ mock_get_org.return_value = mock_org
mock_update_status.return_value = mock_invitation
# Act - should not raise error because emails match case-insensitively
@@ -258,6 +278,75 @@ class TestAcceptInvitationEmailValidation:
# Assert - invitation was accepted (update_invitation_status was called)
mock_update_status.assert_called_once()
+ @pytest.mark.asyncio
+ async def test_accept_invitation_inherits_org_llm_settings(self, mock_invitation):
+ """Test that new members inherit the organization's LLM settings when accepting invitation."""
+ # Arrange
+ user_id = UUID('87654321-4321-8765-4321-876543218765')
+ token = 'inv-test-token-12345'
+
+ mock_user = MagicMock()
+ mock_user.id = user_id
+ mock_user.email = '[email protected]'
+
+ mock_org = MagicMock()
+ mock_org.default_llm_model = 'claude-sonnet-4'
+ mock_org.default_llm_base_url = 'https://api.anthropic.com'
+ mock_org.default_max_iterations = 100
+
+ with (
+ patch(
+ 'server.services.org_invitation_service.OrgInvitationStore.get_invitation_by_token',
+ new_callable=AsyncMock,
+ ) as mock_get_invitation,
+ patch(
+ 'server.services.org_invitation_service.OrgInvitationStore.is_token_expired'
+ ) as mock_is_expired,
+ patch(
+ 'server.services.org_invitation_service.UserStore.get_user_by_id',
+ new_callable=AsyncMock,
+ ) as mock_get_user,
+ patch(
+ 'server.services.org_invitation_service.OrgMemberStore.get_org_member',
+ new_callable=AsyncMock,
+ ) as mock_get_member,
+ patch(
+ 'server.services.org_invitation_service.OrgService.create_litellm_integration',
+ new_callable=AsyncMock,
+ ) as mock_create_litellm,
+ patch(
+ 'server.services.org_invitation_service.OrgStore.get_org_by_id',
+ new_callable=AsyncMock,
+ ) as mock_get_org,
+ patch(
+ 'server.services.org_invitation_service.OrgMemberStore.add_user_to_org',
+ new_callable=AsyncMock,
+ ) as mock_add_user,
+ patch(
+ 'server.services.org_invitation_service.OrgInvitationStore.update_invitation_status',
+ new_callable=AsyncMock,
+ ) as mock_update_status,
+ ):
+ mock_get_invitation.return_value = mock_invitation
+ mock_is_expired.return_value = False
+ mock_get_user.return_value = mock_user
+ mock_get_member.return_value = None
+ mock_settings = MagicMock()
+ mock_settings.llm_api_key = SecretStr('test-key')
+ mock_create_litellm.return_value = mock_settings
+ mock_get_org.return_value = mock_org
+ mock_update_status.return_value = mock_invitation
+
+ # Act
+ await OrgInvitationService.accept_invitation(token, user_id)
+
+ # Assert - verify add_user_to_org was called with org's LLM settings
+ mock_add_user.assert_called_once()
+ call_kwargs = mock_add_user.call_args.kwargs
+ assert call_kwargs['llm_model'] == 'claude-sonnet-4'
+ assert call_kwargs['llm_base_url'] == 'https://api.anthropic.com'
+ assert call_kwargs['max_iterations'] == 100
+
class TestCreateInvitationsBatch:
"""Test cases for batch invitation creation."""
diff --git a/enterprise/tests/unit/test_org_member_store.py b/enterprise/tests/unit/test_org_member_store.py
index c2901358a8..3b3516ee18 100644
--- a/enterprise/tests/unit/test_org_member_store.py
+++ b/enterprise/tests/unit/test_org_member_store.py
@@ -246,6 +246,43 @@ async def test_add_user_to_org(async_session_maker):
assert org_member.status == 'active'
+async def test_add_user_to_org_with_llm_settings(async_session_maker):
+ """Test that add_user_to_org correctly sets inherited LLM settings from organization."""
+ # Arrange
+ async with async_session_maker() as session:
+ org = Org(name='test-org-llm')
+ session.add(org)
+ await session.flush()
+
+ user = User(id=uuid.uuid4(), current_org_id=org.id)
+ role = Role(name='member', rank=2)
+ session.add_all([user, role])
+ await session.commit()
+ org_id = org.id
+ user_id = user.id
+ role_id = role.id
+
+ # Act
+ with patch('storage.org_member_store.a_session_maker', async_session_maker):
+ org_member = await OrgMemberStore.add_user_to_org(
+ org_id=org_id,
+ user_id=user_id,
+ role_id=role_id,
+ llm_api_key='test-api-key',
+ status='active',
+ llm_model='claude-sonnet-4',
+ llm_base_url='https://api.example.com',
+ max_iterations=50,
+ )
+
+ # Assert
+ assert org_member is not None
+ assert org_member.llm_model == 'claude-sonnet-4'
+ assert org_member.llm_base_url == 'https://api.example.com'
+ assert org_member.max_iterations == 50
+
+
@pytest.mark.asyncio
async def test_update_user_role_in_org(async_session_maker):
# Test updating user role in org
diff --git a/enterprise/tests/unit/test_saas_settings_store.py b/enterprise/tests/unit/test_saas_settings_store.py
index b0b634b880..64f5013d1b 100644
--- a/enterprise/tests/unit/test_saas_settings_store.py
+++ b/enterprise/tests/unit/test_saas_settings_store.py
@@ -396,3 +396,44 @@ async def test_store_propagates_llm_settings_to_all_org_members(
assert (
decrypted_key == 'new-shared-api-key'
), f'Expected llm_api_key to decrypt to new-shared-api-key for member {member.user_id}'
+
+
+async def test_store_updates_org_default_llm_settings(
+ session_maker, async_session_maker, mock_config, org_with_multiple_members_fixture
+):
+ """When admin saves LLM settings, org's default_llm_model/base_url/max_iterations should be updated.
+
+ This test verifies that the Org table's default settings are updated so that
+ new members joining later will inherit the correct LLM configuration.
+ """
+ from sqlalchemy import select
+ from storage.org import Org
+
+ # Arrange
+ fixture = org_with_multiple_members_fixture
+ org_id = fixture['org_id']
+ admin_user_id = str(fixture['admin_user_id'])
+
+ store = SaasSettingsStore(admin_user_id, mock_config)
+
+ new_settings = DataSettings(
+ llm_model='anthropic/claude-sonnet-4',
+ llm_base_url='https://api.anthropic.com/v1',
+ max_iterations=75,
+ llm_api_key=SecretStr('test-api-key'),
+ )
+
+ # Act
+ with patch('storage.saas_settings_store.a_session_maker', async_session_maker):
+ await store.store(new_settings)
+
+ # Assert - verify org's default fields were updated
+ with session_maker() as session:
+ result = session.execute(select(Org).where(Org.id == org_id))
+ org = result.scalars().first()
+
+ assert org is not None
+ assert org.default_llm_model == 'anthropic/claude-sonnet-4'
+ assert org.default_llm_base_url == 'https://api.anthropic.com/v1'
+ assert org.default_max_iterations == 75