Skip to content

πŸ™Œ OpenHands: AI-Driven Development

feat(backend): route Jira resolver conversations to claimed org workspaces (#13805)

Hiep Lef271346724e5
diff --git a/enterprise/integrations/jira/jira_view.py b/enterprise/integrations/jira/jira_view.py
index ea461732ea..2a94a15624 100644
--- a/enterprise/integrations/jira/jira_view.py
+++ b/enterprise/integrations/jira/jira_view.py
@@ -7,6 +7,7 @@ Views are responsible for:
"""
from dataclasses import dataclass, field
+from uuid import uuid4
import httpx
from integrations.jira.jira_payload import JiraWebhookPayload
@@ -15,18 +16,25 @@ from integrations.jira.jira_types import (
RepositoryNotFoundError,
StartingConvoException,
)
+from integrations.resolver_org_router import resolve_org_for_repo
from integrations.utils import CONVERSATION_URL, infer_repo_from_message
from jinja2 import Environment
+from server.config import get_config
from storage.jira_conversation import JiraConversation
from storage.jira_integration_store import JiraIntegrationStore
from storage.jira_user import JiraUser
from storage.jira_workspace import JiraWorkspace
+from storage.saas_conversation_store import SaasConversationStore
from openhands.core.logger import openhands_logger as logger
from openhands.integrations.provider import ProviderHandler
-from openhands.server.services.conversation_service import create_new_conversation
+from openhands.server.services.conversation_service import start_conversation
from openhands.server.user_auth.user_auth import UserAuth
-from openhands.storage.data_models.conversation_metadata import ConversationTrigger
+from openhands.storage.data_models.conversation_metadata import (
+ ConversationMetadata,
+ ConversationTrigger,
+)
+from openhands.utils.conversation_summary import get_default_conversation_title
from openhands.utils.http_session import httpx_verify_option
JIRA_CLOUD_API_URL = 'https://api.atlassian.com/ex/jira'
@@ -166,20 +174,68 @@ class JiraNewConversationView(JiraViewInterface):
instructions, user_msg = await self._get_instructions(jinja_env)
try:
- agent_loop_info = await create_new_conversation(
- user_id=self.jira_user.keycloak_user_id,
- git_provider_tokens=provider_tokens,
+ user_id = self.jira_user.keycloak_user_id
+
+ # Resolve git provider from repository
+ resolved_git_provider = None
+ if provider_tokens:
+ try:
+ provider_handler = ProviderHandler(provider_tokens)
+ repository = await provider_handler.verify_repo_provider(
+ self.selected_repo
+ )
+ resolved_git_provider = repository.git_provider
+ except Exception as e:
+ logger.warning(
+ f'[Jira] Failed to resolve git provider for {self.selected_repo}: {e}'
+ )
+
+ # Resolve target org based on claimed git organizations
+ resolved_org_id = None
+ if resolved_git_provider and self.selected_repo:
+ try:
+ resolved_org_id = await resolve_org_for_repo(
+ provider=resolved_git_provider.value,
+ full_repo_name=self.selected_repo,
+ keycloak_user_id=user_id,
+ )
+ except Exception as e:
+ logger.warning(
+ f'[Jira] Failed to resolve org for {self.selected_repo}: {e}'
+ )
+
+ # Create the conversation store with resolver org routing
+ store = await SaasConversationStore.get_resolver_instance(
+ get_config(),
+ user_id,
+ resolved_org_id,
+ )
+
+ conversation_id = uuid4().hex
+ conversation_metadata = ConversationMetadata(
+ trigger=ConversationTrigger.JIRA,
+ conversation_id=conversation_id,
+ title=get_default_conversation_title(conversation_id),
+ user_id=user_id,
selected_repository=self.selected_repo,
selected_branch=None,
+ git_provider=resolved_git_provider,
+ )
+ await store.save_metadata(conversation_metadata)
+
+ await start_conversation(
+ user_id=user_id,
+ git_provider_tokens=provider_tokens,
+ custom_secrets=user_secrets.custom_secrets if user_secrets else None,
initial_user_msg=user_msg,
- conversation_instructions=instructions,
image_urls=None,
replay_json=None,
- conversation_trigger=ConversationTrigger.JIRA,
- custom_secrets=user_secrets.custom_secrets if user_secrets else None,
+ conversation_id=conversation_id,
+ conversation_metadata=conversation_metadata,
+ conversation_instructions=instructions,
)
- self.conversation_id = agent_loop_info.conversation_id
+ self.conversation_id = conversation_id
logger.info(
'[Jira] Created conversation',
@@ -187,6 +243,9 @@ class JiraNewConversationView(JiraViewInterface):
'conversation_id': self.conversation_id,
'issue_key': self.payload.issue_key,
'selected_repo': self.selected_repo,
+ 'resolved_org_id': str(resolved_org_id)
+ if resolved_org_id
+ else None,
},
)
diff --git a/enterprise/tests/unit/integrations/jira/test_jira_view.py b/enterprise/tests/unit/integrations/jira/test_jira_view.py
index 45c326bc05..2dc323ae04 100644
--- a/enterprise/tests/unit/integrations/jira/test_jira_view.py
+++ b/enterprise/tests/unit/integrations/jira/test_jira_view.py
@@ -3,6 +3,7 @@ Tests for Jira view classes and factory.
"""
from unittest.mock import AsyncMock, MagicMock, patch
+from uuid import UUID
import pytest
from integrations.jira.jira_payload import (
@@ -18,6 +19,9 @@ from integrations.jira.jira_view import (
JiraNewConversationView,
)
+from openhands.integrations.service_types import ProviderType
+from openhands.server.user_auth.user_auth import UserAuth
+
class TestJiraNewConversationView:
"""Tests for JiraNewConversationView"""
@@ -86,29 +90,49 @@ class TestJiraNewConversationView:
assert 'Test Issue' in user_msg
@pytest.mark.asyncio
- @patch('integrations.jira.jira_view.create_new_conversation')
+ @patch('integrations.jira.jira_view.resolve_org_for_repo', new_callable=AsyncMock)
+ @patch('integrations.jira.jira_view.ProviderHandler')
+ @patch(
+ 'integrations.jira.jira_view.SaasConversationStore.get_resolver_instance',
+ new_callable=AsyncMock,
+ )
+ @patch('integrations.jira.jira_view.start_conversation', new_callable=AsyncMock)
@patch('integrations.jira.jira_view.integration_store')
async def test_create_or_update_conversation_success(
self,
- mock_store,
- mock_create_conversation,
+ mock_integration_store,
+ mock_start_convo,
+ mock_get_resolver_instance,
+ mock_provider_handler_cls,
+ mock_resolve_org,
new_conversation_view,
mock_jinja_env,
- mock_agent_loop_info,
):
"""Test successful conversation creation"""
new_conversation_view._issue_title = 'Test Issue'
new_conversation_view._issue_description = 'Test description'
- mock_create_conversation.return_value = mock_agent_loop_info
- mock_store.create_conversation = AsyncMock()
+
+ mock_repo = MagicMock()
+ mock_repo.git_provider = ProviderType.GITHUB
+ mock_handler = MagicMock()
+ mock_handler.verify_repo_provider = AsyncMock(return_value=mock_repo)
+ mock_provider_handler_cls.return_value = mock_handler
+
+ mock_resolve_org.return_value = None
+ mock_store = MagicMock()
+ mock_store.save_metadata = AsyncMock()
+ mock_get_resolver_instance.return_value = mock_store
+ mock_integration_store.create_conversation = AsyncMock()
result = await new_conversation_view.create_or_update_conversation(
mock_jinja_env
)
- assert result == 'conv-123'
- mock_create_conversation.assert_called_once()
- mock_store.create_conversation.assert_called_once()
+ assert result is not None
+ assert isinstance(result, str)
+ assert len(result) == 32 # uuid4().hex format
+ mock_start_convo.assert_called_once()
+ mock_integration_store.create_conversation.assert_called_once()
@pytest.mark.asyncio
async def test_create_or_update_conversation_no_repo(
@@ -348,6 +372,125 @@ class TestJiraFactory:
)
+CLAIMING_ORG_ID = UUID('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+
+
+class TestJiraV0ConversationRouting:
+ """Test V0 conversation routing logic based on claimed git organizations."""
+
+ @pytest.fixture
+ def routing_view(
+ self,
+ sample_webhook_payload,
+ sample_jira_user,
+ sample_jira_workspace,
+ ):
+ """View with non-empty provider tokens for routing tests."""
+ user_auth = MagicMock(spec=UserAuth)
+ user_auth.get_provider_tokens = AsyncMock(
+ return_value={ProviderType.GITHUB: MagicMock()}
+ )
+ user_auth.get_secrets = AsyncMock(return_value=None)
+ return JiraNewConversationView(
+ payload=sample_webhook_payload,
+ saas_user_auth=user_auth,
+ jira_user=sample_jira_user,
+ jira_workspace=sample_jira_workspace,
+ selected_repo='test/repo1',
+ _issue_title='Test Issue',
+ _issue_description='Test description',
+ _decrypted_api_key='decrypted_key',
+ )
+
+ @pytest.mark.asyncio
+ @patch('integrations.jira.jira_view.resolve_org_for_repo', new_callable=AsyncMock)
+ @patch('integrations.jira.jira_view.ProviderHandler')
+ @patch(
+ 'integrations.jira.jira_view.SaasConversationStore.get_resolver_instance',
+ new_callable=AsyncMock,
+ )
+ @patch('integrations.jira.jira_view.start_conversation', new_callable=AsyncMock)
+ @patch('integrations.jira.jira_view.integration_store')
+ async def test_routes_to_claimed_org_when_user_is_member(
+ self,
+ mock_integration_store,
+ mock_start_convo,
+ mock_get_resolver_instance,
+ mock_provider_handler_cls,
+ mock_resolve_org,
+ routing_view,
+ mock_jinja_env,
+ ):
+ """When repo belongs to a claimed org and user is a member, conversation is created in that org."""
+ # Arrange
+ mock_repo = MagicMock()
+ mock_repo.git_provider = ProviderType.GITHUB
+ mock_handler = MagicMock()
+ mock_handler.verify_repo_provider = AsyncMock(return_value=mock_repo)
+ mock_provider_handler_cls.return_value = mock_handler
+
+ mock_resolve_org.return_value = CLAIMING_ORG_ID
+ mock_store = MagicMock()
+ mock_store.save_metadata = AsyncMock()
+ mock_get_resolver_instance.return_value = mock_store
+ mock_integration_store.create_conversation = AsyncMock()
+
+ # Act
+ await routing_view.create_or_update_conversation(mock_jinja_env)
+
+ # Assert
+ mock_resolve_org.assert_called_once_with(
+ provider='github',
+ full_repo_name='test/repo1',
+ keycloak_user_id='test_keycloak_id',
+ )
+ call_args = mock_get_resolver_instance.call_args
+ assert call_args[0][1] == 'test_keycloak_id' # user_id
+ assert call_args[0][2] == CLAIMING_ORG_ID # resolver_org_id
+ saved_metadata = mock_store.save_metadata.call_args[0][0]
+ assert saved_metadata.git_provider == ProviderType.GITHUB
+
+ @pytest.mark.asyncio
+ @patch('integrations.jira.jira_view.resolve_org_for_repo', new_callable=AsyncMock)
+ @patch('integrations.jira.jira_view.ProviderHandler')
+ @patch(
+ 'integrations.jira.jira_view.SaasConversationStore.get_resolver_instance',
+ new_callable=AsyncMock,
+ )
+ @patch('integrations.jira.jira_view.start_conversation', new_callable=AsyncMock)
+ @patch('integrations.jira.jira_view.integration_store')
+ async def test_falls_back_to_personal_workspace_when_no_claim(
+ self,
+ mock_integration_store,
+ mock_start_convo,
+ mock_get_resolver_instance,
+ mock_provider_handler_cls,
+ mock_resolve_org,
+ routing_view,
+ mock_jinja_env,
+ ):
+ """When no org has claimed the git org, conversation goes to personal workspace."""
+ # Arrange
+ mock_repo = MagicMock()
+ mock_repo.git_provider = ProviderType.GITHUB
+ mock_handler = MagicMock()
+ mock_handler.verify_repo_provider = AsyncMock(return_value=mock_repo)
+ mock_provider_handler_cls.return_value = mock_handler
+
+ mock_resolve_org.return_value = None
+ mock_store = MagicMock()
+ mock_store.save_metadata = AsyncMock()
+ mock_get_resolver_instance.return_value = mock_store
+ mock_integration_store.create_conversation = AsyncMock()
+
+ # Act
+ await routing_view.create_or_update_conversation(mock_jinja_env)
+
+ # Assert
+ call_args = mock_get_resolver_instance.call_args
+ assert call_args[0][2] is None # resolver_org_id is None
+
+
class TestJiraPayloadParser:
"""Tests for JiraPayloadParser"""