π OpenHands: AI-Driven Development
PLTF-2899: Add async/await static analysis checks for enterprise code (#14664)
aivong-openhands14532ca3ee98
diff --git a/enterprise/dev_config/python/.pre-commit-config.yaml b/enterprise/dev_config/python/.pre-commit-config.yamlindex db9b299950..39aad8a6da 100644--- a/enterprise/dev_config/python/.pre-commit-config.yaml+++ b/enterprise/dev_config/python/.pre-commit-config.yaml@@ -1,6 +1,6 @@repos:- repo: https://github.com/pre-commit/pre-commit-hooks- rev: v4.5.0+ rev: v5.0.0hooks:- id: trailing-whitespaceexclude: docs/modules/python@@ -13,7 +13,7 @@ repos:- id: debug-statementsfiles: ^enterprise/- repo: https://github.com/abravalheri/validate-pyproject- rev: v0.16+ rev: v0.24.1hooks:- id: validate-pyprojecttypes: [toml]@@ -21,7 +21,7 @@ repos:- repo: https://github.com/astral-sh/ruff-pre-commit# Ruff version.- rev: v0.4.1+ rev: v0.12.5hooks:# Run the linter.- id: ruff@@ -36,7 +36,7 @@ repos:files: ^enterprise/- repo: https://github.com/pre-commit/mirrors-mypy- rev: v1.9.0+ rev: v1.15.0hooks:- id: mypyadditional_dependencies:diff --git a/enterprise/dev_config/python/mypy.ini b/enterprise/dev_config/python/mypy.iniindex fa61d93ee7..77cdfabf91 100644--- a/enterprise/dev_config/python/mypy.ini+++ b/enterprise/dev_config/python/mypy.ini@@ -7,6 +7,7 @@ warn_redundant_casts = Trueno_implicit_optional = Truestrict_optional = Truedisable_error_code = type-abstract+enable_error_code = unused-awaitableexclude = (^enterprise/migrations/.*)[mypy-enterprise.tests.unit.test_auth_routes.*]diff --git a/enterprise/dev_config/python/ruff.toml b/enterprise/dev_config/python/ruff.tomlindex 3f45512d7e..c43b12d1b6 100644--- a/enterprise/dev_config/python/ruff.toml+++ b/enterprise/dev_config/python/ruff.toml@@ -1,5 +1,6 @@[lint]select = [+ "ASYNC","E","W","F",@@ -17,6 +18,13 @@ ignore = ["B010","B904","B018",+ # Ignore async rules that may have false positives or are informational+ "ASYNC109", # async function with timeout parameter, use asyncio.timeout instead+ "ASYNC110", # async busy-wait, use Event.wait() instead of while loop with sleep+ "ASYNC220", # create subprocess in async function with blocking methods+ "ASYNC221", # run process in async function with blocking methods+ "ASYNC230", # blocking open() call in async function+ "ASYNC251", # blocking time.sleep() call in async function]exclude = [diff --git a/enterprise/integrations/bitbucket/bitbucket_service.py b/enterprise/integrations/bitbucket/bitbucket_service.pyindex 1a3e255e92..1e0dc55f35 100644--- a/enterprise/integrations/bitbucket/bitbucket_service.py+++ b/enterprise/integrations/bitbucket/bitbucket_service.py@@ -19,7 +19,7 @@ class SaaSBitBucketService(BitBucketService):base_domain: str | None = None,):logger.info(- f'SaaSBitBucketService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {'set' if external_auth_token else 'None'}, bitbucket_token {'set' if token else 'None'}, external_token_manager {external_token_manager}'+ f'SaaSBitBucketService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {"set" if external_auth_token else "None"}, bitbucket_token {"set" if token else "None"}, external_token_manager {external_token_manager}')super().__init__(user_id=user_id,diff --git a/enterprise/integrations/bitbucket/bitbucket_v1_callback_processor.py b/enterprise/integrations/bitbucket/bitbucket_v1_callback_processor.pyindex 7423fc04b0..f86a199138 100644--- a/enterprise/integrations/bitbucket/bitbucket_v1_callback_processor.py+++ b/enterprise/integrations/bitbucket/bitbucket_v1_callback_processor.py@@ -113,7 +113,7 @@ class BitbucketV1CallbackProcessor(EventCallbackProcessor):) -> str:send_message_request = AskAgentRequest(question=message_content)url = (- f"{agent_server_url.rstrip('/')}"+ f'{agent_server_url.rstrip("/")}'f'/api/conversations/{conversation_id}/ask_agent')headers = {'X-Session-API-Key': session_api_key}diff --git a/enterprise/integrations/bitbucket_data_center/bitbucket_dc_manager.py b/enterprise/integrations/bitbucket_data_center/bitbucket_dc_manager.pyindex 48cbdbe01a..584772d542 100644--- a/enterprise/integrations/bitbucket_data_center/bitbucket_dc_manager.py+++ b/enterprise/integrations/bitbucket_data_center/bitbucket_dc_manager.py@@ -208,8 +208,7 @@ class BitbucketDCManager(Manager[BitbucketDCViewType]):)if not installer_user_id:logger.warning(- f'[Bitbucket DC] No installer recorded for '- f'{project_key}/{repo_slug}'+ f'[Bitbucket DC] No installer recorded for {project_key}/{repo_slug}')return@@ -344,8 +343,7 @@ class BitbucketDCManager(Manager[BitbucketDCViewType]):)else:logger.warning(- f'[Bitbucket DC] Unsupported view type: '- f'{type(bitbucket_view).__name__}'+ f'[Bitbucket DC] Unsupported view type: {type(bitbucket_view).__name__}')async def start_job(self, bitbucket_view: BitbucketDCViewType) -> None:diff --git a/enterprise/integrations/bitbucket_data_center/bitbucket_dc_service.py b/enterprise/integrations/bitbucket_data_center/bitbucket_dc_service.pyindex 47da89b8b3..b02aaefb22 100644--- a/enterprise/integrations/bitbucket_data_center/bitbucket_dc_service.py+++ b/enterprise/integrations/bitbucket_data_center/bitbucket_dc_service.py@@ -19,7 +19,7 @@ class SaaSBitbucketDCService(BitbucketDCService):base_domain: str | None = None,):logger.debug(- f'SaaSBitbucketDCService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {'set' if external_auth_token else 'None'}, token {'set' if token else 'None'}, external_token_manager {external_token_manager}'+ f'SaaSBitbucketDCService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {"set" if external_auth_token else "None"}, token {"set" if token else "None"}, external_token_manager {external_token_manager}')super().__init__(user_id=user_id,diff --git a/enterprise/integrations/bitbucket_data_center/bitbucket_dc_v1_callback_processor.py b/enterprise/integrations/bitbucket_data_center/bitbucket_dc_v1_callback_processor.pyindex 12f14cfa2f..96e94b46ea 100644--- a/enterprise/integrations/bitbucket_data_center/bitbucket_dc_v1_callback_processor.py+++ b/enterprise/integrations/bitbucket_data_center/bitbucket_dc_v1_callback_processor.py@@ -115,7 +115,7 @@ class BitbucketDCV1CallbackProcessor(EventCallbackProcessor):) -> str:send_message_request = AskAgentRequest(question=message_content)url = (- f"{agent_server_url.rstrip('/')}"+ f'{agent_server_url.rstrip("/")}'f'/api/conversations/{conversation_id}/ask_agent')headers = {'X-Session-API-Key': session_api_key}diff --git a/enterprise/integrations/github/github_service.py b/enterprise/integrations/github/github_service.pyindex 3f7a325c2e..2529e268c3 100644--- a/enterprise/integrations/github/github_service.py+++ b/enterprise/integrations/github/github_service.py@@ -1,4 +1,5 @@import asyncio+from collections.abc import Coroutinefrom integrations.store_repo_utils import store_repositories_in_dbfrom pydantic import SecretStr@@ -9,6 +10,19 @@ from openhands.app_server.integrations.service_types import ProviderType, Reposifrom openhands.app_server.types import AppModefrom openhands.app_server.utils.logger import openhands_logger as logger+# Module-level set to keep background tasks alive until completion.+# Without this, tasks could be garbage-collected mid-execution.+# See: https://docs.python.org/3/library/asyncio-task.html#asyncio.create_task+_background_tasks: set[asyncio.Task] = set()+++def _create_safe_task(coro: Coroutine) -> asyncio.Task:+ """Create a task that won't be garbage-collected before completion."""+ task = asyncio.create_task(coro)+ task.add_done_callback(_background_tasks.discard)+ _background_tasks.add(task)+ return task+class SaaSGitHubService(GitHubService):def __init__(@@ -21,7 +35,7 @@ class SaaSGitHubService(GitHubService):base_domain: str | None = None,):logger.debug(- f'SaaSGitHubService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {'set' if external_auth_token else 'None'}, github_token {'set' if token else 'None'}, external_token_manager {external_token_manager}'+ f'SaaSGitHubService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {"set" if external_auth_token else "None"}, github_token {"set" if token else "None"}, external_token_manager {external_token_manager}')super().__init__(user_id=user_id,@@ -146,13 +160,20 @@ class SaaSGitHubService(GitHubService):)return None- async def get_paginated_repos(self, page, per_page, sort, installation_id):+ async def get_paginated_repos(+ self,+ page: int,+ per_page: int,+ sort: str,+ installation_id: str | None,+ query: str | None = None,+ ) -> list[Repository]:repositories = await super().get_paginated_repos(- page, per_page, sort, installation_id+ page, per_page, sort, installation_id, query)external_auth_id = await self._get_external_auth_id()if external_auth_id:- asyncio.create_task(+ _ = _create_safe_task(store_repositories_in_db(repositories, external_auth_id))return repositories@@ -164,7 +185,7 @@ class SaaSGitHubService(GitHubService):# Schedule the background task without awaiting itexternal_auth_id = await self._get_external_auth_id()if external_auth_id:- asyncio.create_task(+ _ = _create_safe_task(store_repositories_in_db(repositories, external_auth_id))# Return repositories immediatelydiff --git a/enterprise/integrations/github/github_v1_callback_processor.py b/enterprise/integrations/github/github_v1_callback_processor.pyindex 735e571f45..f0e69ad665 100644--- a/enterprise/integrations/github/github_v1_callback_processor.py+++ b/enterprise/integrations/github/github_v1_callback_processor.py@@ -181,8 +181,8 @@ class GithubV1CallbackProcessor(EventCallbackProcessor):send_message_request = AskAgentRequest(question=message_content)url = (- f"{agent_server_url.rstrip('/')}"- f"/api/conversations/{conversation_id}/ask_agent"+ f'{agent_server_url.rstrip("/")}'+ f'/api/conversations/{conversation_id}/ask_agent')headers = {'X-Session-API-Key': session_api_key}payload = send_message_request.model_dump()@@ -285,9 +285,9 @@ class GithubV1CallbackProcessor(EventCallbackProcessor):app_conversation_info.sandbox_id,)- assert (- sandbox.session_api_key is not None- ), f'No session API key for sandbox: {sandbox.id}'+ assert sandbox.session_api_key is not None, (+ f'No session API key for sandbox: {sandbox.id}'+ )# 3. URL + instructionagent_server_url = get_agent_server_url_from_sandbox(sandbox)diff --git a/enterprise/integrations/gitlab/gitlab_service.py b/enterprise/integrations/gitlab/gitlab_service.pyindex 121510369a..ef828160b0 100644--- a/enterprise/integrations/gitlab/gitlab_service.py+++ b/enterprise/integrations/gitlab/gitlab_service.py@@ -29,7 +29,7 @@ class SaaSGitLabService(GitLabService):base_domain: str | None = None,):logger.info(- f'SaaSGitLabService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {'set' if external_auth_token else 'None'}, gitlab_token {'set' if token else 'None'}, external_token_manager {external_token_manager}'+ f'SaaSGitLabService created with user_id {user_id}, external_auth_id {external_auth_id}, external_auth_token {"set" if external_auth_token else "None"}, gitlab_token {"set" if token else "None"}, external_token_manager {external_token_manager}')super().__init__(user_id=user_id,@@ -316,7 +316,7 @@ class SaaSGitLabService(GitLabService):# Store webhook and repository infoif store_in_background:- asyncio.create_task(+ _ = asyncio.create_task(self.store_repository_data(users_personal_projects, repositories))else:diff --git a/enterprise/integrations/gitlab/gitlab_v1_callback_processor.py b/enterprise/integrations/gitlab/gitlab_v1_callback_processor.pyindex b851102370..21f282dd69 100644--- a/enterprise/integrations/gitlab/gitlab_v1_callback_processor.py+++ b/enterprise/integrations/gitlab/gitlab_v1_callback_processor.py@@ -153,8 +153,8 @@ class GitlabV1CallbackProcessor(EventCallbackProcessor):send_message_request = AskAgentRequest(question=message_content)url = (- f"{agent_server_url.rstrip('/')}"- f"/api/conversations/{conversation_id}/ask_agent"+ f'{agent_server_url.rstrip("/")}'+ f'/api/conversations/{conversation_id}/ask_agent')headers = {'X-Session-API-Key': session_api_key}payload = send_message_request.model_dump()@@ -257,9 +257,9 @@ class GitlabV1CallbackProcessor(EventCallbackProcessor):app_conversation_info.sandbox_id,)- assert (- sandbox.session_api_key is not None- ), f'No session API key for sandbox: {sandbox.id}'+ assert sandbox.session_api_key is not None, (+ f'No session API key for sandbox: {sandbox.id}'+ )# 3. URL + instructionagent_server_url = get_agent_server_url_from_sandbox(sandbox)diff --git a/enterprise/integrations/jira/jira_payload.py b/enterprise/integrations/jira/jira_payload.pyindex 36807dab23..e66a42f02c 100644--- a/enterprise/integrations/jira/jira_payload.py+++ b/enterprise/integrations/jira/jira_payload.py@@ -221,7 +221,7 @@ class JiraPayloadParser:missing.append('base_api_url (derived from issue.self)')if missing:- return JiraPayloadError(f"Missing required fields: {', '.join(missing)}")+ return JiraPayloadError(f'Missing required fields: {", ".join(missing)}')return JiraPayloadSuccess(JiraWebhookPayload(diff --git a/enterprise/integrations/jira/jira_v1_callback_processor.py b/enterprise/integrations/jira/jira_v1_callback_processor.pyindex 3b49978904..2f98305e52 100644--- a/enterprise/integrations/jira/jira_v1_callback_processor.py+++ b/enterprise/integrations/jira/jira_v1_callback_processor.py@@ -131,9 +131,9 @@ class JiraV1CallbackProcessor(EventCallbackProcessor):app_conversation_info.sandbox_id,)- assert (- sandbox.session_api_key is not None- ), f'No session API key for sandbox: {sandbox.id}'+ assert sandbox.session_api_key is not None, (+ f'No session API key for sandbox: {sandbox.id}'+ )# 3. URL + instructionagent_server_url = get_agent_server_url_from_sandbox(sandbox)@@ -162,8 +162,8 @@ class JiraV1CallbackProcessor(EventCallbackProcessor):send_message_request = AskAgentRequest(question=message_content)url = (- f"{agent_server_url.rstrip('/')}"- f"/api/conversations/{conversation_id}/ask_agent"+ f'{agent_server_url.rstrip("/")}'+ f'/api/conversations/{conversation_id}/ask_agent')headers = {'X-Session-API-Key': session_api_key}payload = send_message_request.model_dump()diff --git a/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.py b/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.pyindex eeee61b589..905f59a304 100644--- a/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.py+++ b/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.py@@ -141,9 +141,9 @@ class JiraDcV1CallbackProcessor(EventCallbackProcessor):app_conversation_info.sandbox_id,)- assert (- sandbox.session_api_key is not None- ), f'No session API key for sandbox: {sandbox.id}'+ assert sandbox.session_api_key is not None, (+ f'No session API key for sandbox: {sandbox.id}'+ )# 3. URL + instructionagent_server_url = get_agent_server_url_from_sandbox(sandbox)@@ -172,8 +172,8 @@ class JiraDcV1CallbackProcessor(EventCallbackProcessor):send_message_request = AskAgentRequest(question=message_content)url = (- f"{agent_server_url.rstrip('/')}"- f"/api/conversations/{conversation_id}/ask_agent"+ f'{agent_server_url.rstrip("/")}'+ f'/api/conversations/{conversation_id}/ask_agent')headers = {'X-Session-API-Key': session_api_key}payload = send_message_request.model_dump()diff --git a/enterprise/integrations/slack/slack_types.py b/enterprise/integrations/slack/slack_types.pyindex 3296261c06..f41bec6132 100644--- a/enterprise/integrations/slack/slack_types.py+++ b/enterprise/integrations/slack/slack_types.py@@ -95,9 +95,14 @@ class SlackMessageView:)+@dataclassclass SlackViewInterface(SlackMessageView, SummaryExtractionTracker, ABC):"""Interface for authenticated Slack views that can create conversations.+ Note: The @dataclass decorator is required to resolve __replace__ method+ incompatibility between parent dataclasses (SlackMessageView and+ SummaryExtractionTracker). See: https://github.com/python/mypy/issues/5580+All fields are required (non-None) because this interface is only usedfor users who have linked their Slack account to OpenHands.diff --git a/enterprise/integrations/slack/slack_v1_callback_processor.py b/enterprise/integrations/slack/slack_v1_callback_processor.pyindex e6112c0182..dba3cdbe6c 100644--- a/enterprise/integrations/slack/slack_v1_callback_processor.py+++ b/enterprise/integrations/slack/slack_v1_callback_processor.py@@ -127,7 +127,7 @@ class SlackV1CallbackProcessor(EventCallbackProcessor):if not response['ok']:raise RuntimeError(- f"Slack API error: {response.get('error', 'Unknown error')}"+ f'Slack API error: {response.get("error", "Unknown error")}')_logger.info(@@ -154,8 +154,8 @@ class SlackV1CallbackProcessor(EventCallbackProcessor):send_message_request = AskAgentRequest(question=message_content)url = (- f"{agent_server_url.rstrip('/')}"- f"/api/conversations/{conversation_id}/ask_agent"+ f'{agent_server_url.rstrip("/")}'+ f'/api/conversations/{conversation_id}/ask_agent')headers = {'X-Session-API-Key': session_api_key}payload = send_message_request.model_dump()@@ -258,9 +258,9 @@ class SlackV1CallbackProcessor(EventCallbackProcessor):app_conversation_info.sandbox_id,)- assert (- sandbox.session_api_key is not None- ), f'No session API key for sandbox: {sandbox.id}'+ assert sandbox.session_api_key is not None, (+ f'No session API key for sandbox: {sandbox.id}'+ )# 3. URL + instructionagent_server_url = get_agent_server_url_from_sandbox(sandbox)diff --git a/enterprise/integrations/slack/slack_view.py b/enterprise/integrations/slack/slack_view.pyindex 764c57987a..73d0a2ce74 100644--- a/enterprise/integrations/slack/slack_view.py+++ b/enterprise/integrations/slack/slack_view.py@@ -366,9 +366,9 @@ class SlackUpdateExistingConversationView(SlackNewConversationView):httpx_client=httpx_client,)- assert (- running_sandbox.session_api_key is not None- ), f'No session API key for sandbox: {running_sandbox.id}'+ assert running_sandbox.session_api_key is not None, (+ f'No session API key for sandbox: {running_sandbox.id}'+ )# 3. Get the agent server URLagent_server_url = get_agent_server_url_from_sandbox(running_sandbox)diff --git a/enterprise/server/auth/gitlab_sync.py b/enterprise/server/auth/gitlab_sync.pyindex 80c2ecc7da..7fccd343c1 100644--- a/enterprise/server/auth/gitlab_sync.py+++ b/enterprise/server/auth/gitlab_sync.py@@ -68,4 +68,4 @@ def schedule_gitlab_repo_sync(except Exception:logger.warning('gitlab_repo_sync_failed', exc_info=True)- asyncio.create_task(_run())+ _ = asyncio.create_task(_run())diff --git a/enterprise/server/config.py b/enterprise/server/config.pyindex 2ac3bd3792..024f5ce218 100644--- a/enterprise/server/config.py+++ b/enterprise/server/config.py@@ -114,7 +114,7 @@ class SaaSServerConfig(ServerConfig):# Check if the response is successfulif response.status_code != 200:raise ValueError(- f'Failed to retrieve app info, status code:{response.status_code}, message:{response.content.decode('utf-8')}'+ f'Failed to retrieve app info, status code:{response.status_code}, message:{response.content.decode("utf-8")}')# Extract the app slug from the responsediff --git a/enterprise/server/rate_limit.py b/enterprise/server/rate_limit.pyindex c95874aa9e..8b49bfffb7 100644--- a/enterprise/server/rate_limit.py+++ b/enterprise/server/rate_limit.py@@ -127,7 +127,7 @@ def _rate_limit_exceeded_handler(request: Request, exc: Exception) -> Response:logger.info(exc.__class__.__name__)if isinstance(exc, RateLimitException):response = JSONResponse(- {'error': f'Rate limit exceeded: { exc.detail}'}, status_code=429+ {'error': f'Rate limit exceeded: {exc.detail}'}, status_code=429)if exc.result:exc.result.add_headers(response)diff --git a/enterprise/server/routes/integration/jira.py b/enterprise/server/routes/integration/jira.pyindex 8cc9c802a5..fc4e2277ac 100644--- a/enterprise/server/routes/integration/jira.py+++ b/enterprise/server/routes/integration/jira.py@@ -7,7 +7,7 @@ import uuidfrom typing import castfrom urllib.parse import urlencode, urlparse-import requests+import httpxfrom fastapi import APIRouter, BackgroundTasks, Header, HTTPException, Request, statusfrom fastapi.responses import JSONResponse, RedirectResponsefrom integrations.jira.jira_manager import JiraManager@@ -34,6 +34,7 @@ JIRA_AUTH_URL = 'https://auth.atlassian.com/authorize'JIRA_TOKEN_URL = 'https://auth.atlassian.com/oauth/token'JIRA_RESOURCES_URL = 'https://api.atlassian.com/oauth/token/accessible-resources'JIRA_USER_INFO_URL = 'https://api.atlassian.com/me'+JIRA_TIMEOUT = httpx.Timeout(30.0)# Request/Response models@@ -480,7 +481,8 @@ async def jira_callback(request: Request, code: str, state: str):'code': code,'redirect_uri': JIRA_REDIRECT_URI,}- response = requests.post(JIRA_TOKEN_URL, json=token_payload)+ async with httpx.AsyncClient(timeout=JIRA_TIMEOUT) as client:+ response = await client.post(JIRA_TOKEN_URL, json=token_payload)if response.status_code != 200:raise HTTPException(status_code=400, detail=f'Error fetching token: {response.text}'@@ -490,7 +492,8 @@ async def jira_callback(request: Request, code: str, state: str):access_token = token_data['access_token']headers = {'Authorization': f'Bearer {access_token}'}- response = requests.get(JIRA_RESOURCES_URL, headers=headers)+ async with httpx.AsyncClient(timeout=JIRA_TIMEOUT) as client:+ response = await client.get(JIRA_RESOURCES_URL, headers=headers)if response.status_code != 200:raise HTTPException(@@ -520,7 +523,8 @@ async def jira_callback(request: Request, code: str, state: str):jira_cloud_id = target_workspace_data.get('id', '')- jira_user_response = requests.get(JIRA_USER_INFO_URL, headers=headers)+ async with httpx.AsyncClient(timeout=JIRA_TIMEOUT) as client:+ jira_user_response = await client.get(JIRA_USER_INFO_URL, headers=headers)if jira_user_response.status_code != 200:raise HTTPException(status_code=400,diff --git a/enterprise/server/routes/integration/jira_dc.py b/enterprise/server/routes/integration/jira_dc.pyindex 6a9f03d68a..5b2862a100 100644--- a/enterprise/server/routes/integration/jira_dc.py+++ b/enterprise/server/routes/integration/jira_dc.py@@ -7,7 +7,7 @@ from typing import castfrom urllib.parse import urlencode, urlparsefrom uuid import UUID-import requests+import httpxfrom fastapi import (APIRouter,BackgroundTasks,@@ -811,7 +811,8 @@ async def jira_dc_callback(request: Request, code: str, state: str):'code': code,'redirect_uri': JIRA_DC_REDIRECT_URI,}- response = requests.post(JIRA_DC_TOKEN_URL, data=token_payload)+ async with httpx.AsyncClient() as client:+ response = await client.post(JIRA_DC_TOKEN_URL, data=token_payload)if response.status_code != 200:raise HTTPException(status_code=400, detail=f'Error fetching token: {response.text}'@@ -825,7 +826,8 @@ async def jira_dc_callback(request: Request, code: str, state: str):if target_workspace != urlparse(JIRA_DC_BASE_URL).hostname:raise HTTPException(status_code=400, detail='Target workspace mismatch.')- jira_dc_user_response = requests.get(JIRA_DC_USER_INFO_URL, headers=headers)+ async with httpx.AsyncClient() as client:+ jira_dc_user_response = await client.get(JIRA_DC_USER_INFO_URL, headers=headers)if jira_dc_user_response.status_code != 200:raise HTTPException(status_code=400,diff --git a/enterprise/storage/lite_llm_manager.py b/enterprise/storage/lite_llm_manager.pyindex 8319743b21..f8cb474947 100644--- a/enterprise/storage/lite_llm_manager.py+++ b/enterprise/storage/lite_llm_manager.py@@ -392,7 +392,7 @@ class LiteLlmManager:llm_base_url = llm_cfg.get('base_url')if llm_base_url == LITE_LLM_API_URL:db_key = llm_cfg.get('api_key')- if hasattr(db_key, 'get_secret_value'):+ if db_key is not None and hasattr(db_key, 'get_secret_value'):db_key = db_key.get_secret_value()if db_key:diff --git a/enterprise/tests/unit/integrations/bitbucket/test_bitbucket_manager.py b/enterprise/tests/unit/integrations/bitbucket/test_bitbucket_manager.pyindex 1757e5440d..58369185fe 100644--- a/enterprise/tests/unit/integrations/bitbucket/test_bitbucket_manager.py+++ b/enterprise/tests/unit/integrations/bitbucket/test_bitbucket_manager.py@@ -90,11 +90,13 @@ def _inline_view() -> BitbucketInlinePRComment:async def test_receive_message_dispatches_when_commenter_has_write_access() -> None:manager = BitbucketManager(AsyncMock())- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'- ), patch.object(- manager, '_commenter_has_write_access', return_value=True- ), patch.object(manager, 'start_job', new=AsyncMock()) as mock_start:+ with (+ patch.object(+ manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'+ ),+ patch.object(manager, '_commenter_has_write_access', return_value=True),+ patch.object(manager, 'start_job', new=AsyncMock()) as mock_start,+ ):await manager.receive_message(_comment_message())mock_start.assert_awaited_once()@@ -104,11 +106,13 @@ async def test_receive_message_dispatches_when_commenter_has_write_access() -> Nasync def test_receive_message_skips_when_commenter_lacks_write_access() -> None:manager = BitbucketManager(AsyncMock())- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'- ), patch.object(- manager, '_commenter_has_write_access', return_value=False- ), patch.object(manager, 'start_job', new=AsyncMock()) as mock_start:+ with (+ patch.object(+ manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'+ ),+ patch.object(manager, '_commenter_has_write_access', return_value=False),+ patch.object(manager, 'start_job', new=AsyncMock()) as mock_start,+ ):await manager.receive_message(_comment_message())mock_start.assert_not_called()@@ -118,9 +122,10 @@ async def test_receive_message_skips_when_commenter_lacks_write_access() -> Noneasync def test_receive_message_skips_when_no_installer_recorded_for_webhook() -> None:manager = BitbucketManager(AsyncMock())- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value=None- ), patch.object(manager, 'start_job', new=AsyncMock()) as mock_start:+ with (+ patch.object(manager.webhook_store, 'get_webhook_user_id', return_value=None),+ patch.object(manager, 'start_job', new=AsyncMock()) as mock_start,+ ):await manager.receive_message(_comment_message())mock_start.assert_not_called()diff --git a/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_manager.py b/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_manager.pyindex c71d4d81c4..2480504d64 100644--- a/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_manager.py+++ b/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_manager.py@@ -121,11 +121,13 @@ async def test_receive_message_runs_job_as_mentioner_when_linked_in_keycloak():async def fake_start_job(view):captured['view'] = view- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'- ), patch.object(- manager, '_commenter_has_write_access', return_value=True- ), patch.object(manager, 'start_job', new=fake_start_job):+ with (+ patch.object(+ manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'+ ),+ patch.object(manager, '_commenter_has_write_access', return_value=True),+ patch.object(manager, 'start_job', new=fake_start_job),+ ):await manager.receive_message(_comment_message())view = captured['view']@@ -152,13 +154,16 @@ async def test_receive_message_asks_unenrolled_mentioner_to_sign_up():token_manager.get_user_id_from_idp_user_id = AsyncMock(return_value=None)manager = BitbucketDCManager(token_manager)- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'- ), patch.object(- manager, '_commenter_has_write_access', return_value=True- ), patch.object(manager, 'start_job', new=AsyncMock()) as mock_start, patch.object(- manager, '_send_user_not_found_message', new=AsyncMock()- ) as mock_not_found:+ with (+ patch.object(+ manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'+ ),+ patch.object(manager, '_commenter_has_write_access', return_value=True),+ patch.object(manager, 'start_job', new=AsyncMock()) as mock_start,+ patch.object(+ manager, '_send_user_not_found_message', new=AsyncMock()+ ) as mock_not_found,+ ):await manager.receive_message(_comment_message())mock_start.assert_not_called()@@ -182,13 +187,16 @@ async def test_receive_message_drops_event_when_keycloak_lookup_raises():)manager = BitbucketDCManager(token_manager)- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'- ), patch.object(- manager, '_commenter_has_write_access', return_value=True- ), patch.object(manager, 'start_job', new=AsyncMock()) as mock_start, patch.object(- manager, '_send_user_not_found_message', new=AsyncMock()- ) as mock_not_found:+ with (+ patch.object(+ manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'+ ),+ patch.object(manager, '_commenter_has_write_access', return_value=True),+ patch.object(manager, 'start_job', new=AsyncMock()) as mock_start,+ patch.object(+ manager, '_send_user_not_found_message', new=AsyncMock()+ ) as mock_not_found,+ ):await manager.receive_message(_comment_message())mock_start.assert_not_called()@@ -205,12 +213,13 @@ async def test_send_user_not_found_message_replies_as_installer():manager = BitbucketDCManager(AsyncMock())sentinel_view = object()- with patch(- 'integrations.bitbucket_data_center.bitbucket_dc_manager.BitbucketDCFactory.create_bitbucket_dc_view_from_payload',- new=AsyncMock(return_value=sentinel_view),- ) as mock_factory, patch.object(- manager, 'send_message', new=AsyncMock()- ) as mock_send:+ with (+ patch(+ 'integrations.bitbucket_data_center.bitbucket_dc_manager.BitbucketDCFactory.create_bitbucket_dc_view_from_payload',+ new=AsyncMock(return_value=sentinel_view),+ ) as mock_factory,+ patch.object(manager, 'send_message', new=AsyncMock()) as mock_send,+ ):await manager._send_user_not_found_message(_comment_message(), 'kc-installer', 'alice')@@ -231,11 +240,13 @@ async def test_send_user_not_found_message_replies_as_installer():async def test_receive_message_skips_when_commenter_lacks_write_access():manager = BitbucketDCManager(AsyncMock())- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'- ), patch.object(- manager, '_commenter_has_write_access', return_value=False- ), patch.object(manager, 'start_job', new=AsyncMock()) as mock_start:+ with (+ patch.object(+ manager.webhook_store, 'get_webhook_user_id', return_value='kc-installer'+ ),+ patch.object(manager, '_commenter_has_write_access', return_value=False),+ patch.object(manager, 'start_job', new=AsyncMock()) as mock_start,+ ):await manager.receive_message(_comment_message())mock_start.assert_not_called()@@ -245,9 +256,10 @@ async def test_receive_message_skips_when_commenter_lacks_write_access():async def test_receive_message_skips_when_no_installer_recorded_for_repo():manager = BitbucketDCManager(AsyncMock())- with patch.object(- manager.webhook_store, 'get_webhook_user_id', return_value=None- ), patch.object(manager, 'start_job', new=AsyncMock()) as mock_start:+ with (+ patch.object(manager.webhook_store, 'get_webhook_user_id', return_value=None),+ patch.object(manager, 'start_job', new=AsyncMock()) as mock_start,+ ):await manager.receive_message(_comment_message())mock_start.assert_not_called()@@ -322,12 +334,15 @@ def test_posting_service_uses_bot_token_when_set():"""manager = BitbucketDCManager(AsyncMock())- with patch(- 'integrations.bitbucket_data_center.bitbucket_dc_manager.BITBUCKET_DATA_CENTER_BOT_TOKEN',- 'bot-pat-123',- ), patch(- 'integrations.bitbucket_data_center.bitbucket_dc_service.SaaSBitbucketDCService'- ) as service_cls:+ with (+ patch(+ 'integrations.bitbucket_data_center.bitbucket_dc_manager.BITBUCKET_DATA_CENTER_BOT_TOKEN',+ 'bot-pat-123',+ ),+ patch(+ 'integrations.bitbucket_data_center.bitbucket_dc_service.SaaSBitbucketDCService'+ ) as service_cls,+ ):svc = manager._posting_service('kc-alice')# Built with no per-user auth; the raw bot token is set directly so the@@ -346,12 +361,15 @@ def test_posting_service_falls_back_to_user_token_when_bot_unset():"""manager = BitbucketDCManager(AsyncMock())- with patch(- 'integrations.bitbucket_data_center.bitbucket_dc_manager.BITBUCKET_DATA_CENTER_BOT_TOKEN',- '',- ), patch(- 'integrations.bitbucket_data_center.bitbucket_dc_service.SaaSBitbucketDCService'- ) as service_cls:+ with (+ patch(+ 'integrations.bitbucket_data_center.bitbucket_dc_manager.BITBUCKET_DATA_CENTER_BOT_TOKEN',+ '',+ ),+ patch(+ 'integrations.bitbucket_data_center.bitbucket_dc_service.SaaSBitbucketDCService'+ ) as service_cls,+ ):manager._posting_service('kc-alice')service_cls.assert_called_once_with(external_auth_id='kc-alice')diff --git a/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_service.py b/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_service.pyindex 047b7f9918..9bc3d17a42 100644--- a/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_service.py+++ b/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_service.py@@ -73,16 +73,19 @@ class TestGetLatestToken:):offline_token = 'test_offline_token'expected_token = 'test_bitbucket_dc_token'- with patch.object(- service_with_external_auth_id.token_manager,- 'load_offline_token',- new_callable=AsyncMock,- return_value=offline_token,- ), patch.object(- service_with_external_auth_id.token_manager,- 'get_idp_token_from_offline_token',- new_callable=AsyncMock,- return_value=expected_token,+ with (+ patch.object(+ service_with_external_auth_id.token_manager,+ 'load_offline_token',+ new_callable=AsyncMock,+ return_value=offline_token,+ ),+ patch.object(+ service_with_external_auth_id.token_manager,+ 'get_idp_token_from_offline_token',+ new_callable=AsyncMock,+ return_value=expected_token,+ ),):token = await service_with_external_auth_id.get_latest_token()@@ -116,16 +119,19 @@ class TestGetLatestToken:external_auth_token=SecretStr('test_keycloak_token'),external_auth_id='test_user_id',)- with patch.object(- service.token_manager,- 'get_idp_token',- new_callable=AsyncMock,- return_value=expected_token,- ) as mock_get_idp_token, patch.object(- service.token_manager,- 'load_offline_token',- new_callable=AsyncMock,- ) as mock_load_offline:+ with (+ patch.object(+ service.token_manager,+ 'get_idp_token',+ new_callable=AsyncMock,+ return_value=expected_token,+ ) as mock_get_idp_token,+ patch.object(+ service.token_manager,+ 'load_offline_token',+ new_callable=AsyncMock,+ ) as mock_load_offline,+ ):token = await service.get_latest_token()assert token is not Nonediff --git a/enterprise/tests/unit/integrations/test_resolver_context.py b/enterprise/tests/unit/integrations/test_resolver_context.pyindex 5cb31280ff..bd75a0cfd9 100644--- a/enterprise/tests/unit/integrations/test_resolver_context.py+++ b/enterprise/tests/unit/integrations/test_resolver_context.py@@ -232,9 +232,9 @@ async def test_get_latest_token_returns_string_for_multiple_providers((ProviderType.BITBUCKET, 'bitbucket_token'),]:result = await resolver_context.get_latest_token(provider_type)- assert isinstance(- result, str- ), f'Expected str for {provider_type.name}, got {type(result).__name__}'+ assert isinstance(result, str), (+ f'Expected str for {provider_type.name}, got {type(result).__name__}'+ )assert result == expected_tokendiff --git a/enterprise/tests/unit/server/routes/test_auth_onboarding.py b/enterprise/tests/unit/server/routes/test_auth_onboarding.pyindex 6199e195e7..93d45291ae 100644--- a/enterprise/tests/unit/server/routes/test_auth_onboarding.py+++ b/enterprise/tests/unit/server/routes/test_auth_onboarding.py@@ -296,8 +296,7 @@ class TestGetPostAuthRedirect:)assert result == (- 'https://example.com/onboarding'- '?returnTo=%2Fconversations%2Fabc%3Ffoo%3Dbar'+ 'https://example.com/onboarding?returnTo=%2Fconversations%2Fabc%3Ffoo%3Dbar')@@ -323,7 +322,7 @@ class TestBuildOnboardingRedirect:'https://example.com/foo?bar=baz&qux=1', 'https://example.com')assert result == (- 'https://example.com/onboarding' '?returnTo=%2Ffoo%3Fbar%3Dbaz%26qux%3D1'+ 'https://example.com/onboarding?returnTo=%2Ffoo%3Fbar%3Dbaz%26qux%3D1')def test_skips_returnTo_for_bare_home_with_trailing_slash(self):@@ -390,13 +389,10 @@ class TestBuildOnboardingRedirect:query-string layering goes wrong)."""result = _build_onboarding_redirect(- 'https://example.com/login?returnTo=%2Fsettings%2Fuser'- '&login_method=github',+ 'https://example.com/login?returnTo=%2Fsettings%2Fuser&login_method=github','https://example.com',)- assert result == (- 'https://example.com/onboarding' '?returnTo=%2Fsettings%2Fuser'- )+ assert result == ('https://example.com/onboarding?returnTo=%2Fsettings%2Fuser')def test_unwraps_login_returnTo_with_inner_query_string(self):"""Inner destinations with their own query string survive unwrap.@@ -411,8 +407,7 @@ class TestBuildOnboardingRedirect:'https://example.com',)assert result == (- 'https://example.com/onboarding'- '?returnTo=%2Fconversations%2Fabc%3Ffoo%3Dbar'+ 'https://example.com/onboarding?returnTo=%2Fconversations%2Fabc%3Ffoo%3Dbar')def test_unwraps_login_returnTo_to_bare_home_skips_returnTo(self):@@ -439,7 +434,7 @@ class TestBuildOnboardingRedirect:'https://example.com/foo?returnTo=%2Fbar', 'https://example.com')assert result == (- 'https://example.com/onboarding' '?returnTo=%2Ffoo%3FreturnTo%3D%252Fbar'+ 'https://example.com/onboarding?returnTo=%2Ffoo%3FreturnTo%3D%252Fbar')diff --git a/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py b/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.pyindex f359beb08a..851483a54f 100644--- a/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py+++ b/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py@@ -1,5 +1,6 @@import jsonimport uuid+from contextlib import asynccontextmanagerfrom datetime import datetimefrom unittest.mock import AsyncMock, MagicMock, patchfrom urllib.parse import parse_qs, urlparse@@ -25,6 +26,79 @@ from server.routes.integration.jira_dc import ()+def create_httpx_mock(post_response=None, get_response=None, get_responses=None):+ """Create a mock for httpx.AsyncClient.++ Args:+ post_response: Response for POST requests. Can be a dict (JSON body) or+ a MagicMock for full control.+ get_response: Default response for GET requests. Can be a dict (JSON body) or+ a MagicMock for full control.+ get_responses: Dict of URL pattern -> response for conditional GET responses.+ e.g. {'accessible-resources': {...}, '/myself': {...}}++ Returns:+ AsyncMock that can be used as httpx.AsyncClient context manager.+ """+ mock_response = MagicMock()+ mock_response.status_code = 200+ mock_response.json.return_value = {'access_token': 'token'}++ if isinstance(post_response, dict):+ mock_post_response = MagicMock()+ mock_post_response.status_code = 200+ mock_post_response.json.return_value = post_response+ else:+ mock_post_response = post_response or mock_response++ # Create mock client with post/get methods+ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)+ mock_client.get = AsyncMock(return_value=mock_response)++ # Set up conditional GET responses if provided+ if get_responses:++ async def mock_get(url, **kwargs):+ for pattern, resp in get_responses.items():+ if pattern in url:+ mock_resp = MagicMock()+ mock_resp.status_code = 200+ if isinstance(resp, dict):+ mock_resp.json.return_value = resp+ else:+ mock_resp = resp+ return mock_resp+ # Default response for unmatched URLs+ default_resp = MagicMock()+ default_resp.status_code = 404+ default_resp.json.return_value = {}+ return default_resp++ mock_client.get = AsyncMock(side_effect=mock_get)+ elif isinstance(get_response, dict):+ mock_get_response = MagicMock()+ mock_get_response.status_code = 200+ mock_get_response.json.return_value = get_response+ mock_client.get = AsyncMock(return_value=mock_get_response)++ # Create the AsyncClient context manager mock+ @asynccontextmanager+ async def mock_async_client():+ yield mock_client++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)+ return mock_httpx+++def mock_httpx_client():+ """Fixture to provide httpx.AsyncClient mock."""+ return create_httpx_mock++@pytest.fixturedef mock_request():req = MagicMock(spec=Request)@@ -186,15 +260,13 @@ async def test_create_workspace_link_oauth_success(@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-@patch('requests.get')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)@patch('server.routes.integration.jira_dc._handle_workspace_link_creation',new_callable=AsyncMock,)async def test_jira_dc_callback_workspace_integration_new_workspace(- mock_handle_link, mock_manager, mock_get, mock_post, mock_redis, mock_request+ mock_handle_link, mock_manager, mock_redis, mock_request):state = 'test_state'code = 'test_code'@@ -209,28 +281,16 @@ async def test_jira_dc_callback_workspace_integration_new_workspace('state': state,}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- # Set up different responses for different GET requests- def mock_get_side_effect(url, **kwargs):- if 'accessible-resources' in url:- return MagicMock(- status_code=200,- json=lambda: [{'url': 'https://test.atlassian.net'}],- text='Success',- )- elif url.endswith('/myself') or 'api.atlassian.com/me' in url:- return MagicMock(- status_code=200,- json=lambda: {'key': 'jira_user_123'},- text='Success',- )- else:- return MagicMock(status_code=404, text='Not found')+ # Set up httpx mock with conditional GET responses+ httpx_mock = create_httpx_mock(+ post_response={'access_token': 'token'},+ get_responses={+ 'accessible-resources': [{'url': 'https://test.atlassian.net'}],+ '/myself': {'key': 'jira_user_123'},+ },+ )- mock_get.side_effect = mock_get_side_effectmock_manager.integration_store.get_workspace_by_name.return_value = Nonemock_workspace = MagicMock(id=1)mock_manager.integration_store.create_workspace.return_value = mock_workspace@@ -240,21 +300,20 @@ async def test_jira_dc_callback_workspace_integration_new_workspace('server.routes.integration.jira_dc.JIRA_DC_BASE_URL','https://test.atlassian.net',):- mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'- response = await jira_dc_callback(mock_request, code, state)-- assert isinstance(response, RedirectResponse)- assert response.status_code == status.HTTP_302_FOUND- mock_manager.integration_store.create_workspace.assert_called_once()- mock_handle_link.assert_called_once_with(- 'user1', 'jira_user_123', 'test.atlassian.net'- )+ with patch('httpx.AsyncClient', return_value=httpx_mock):+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'+ response = await jira_dc_callback(mock_request, code, state)++ assert isinstance(response, RedirectResponse)+ assert response.status_code == status.HTTP_302_FOUND+ mock_manager.integration_store.create_workspace.assert_called_once()+ mock_handle_link.assert_called_once_with(+ 'user1', 'jira_user_123', 'test.atlassian.net'+ )@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-@patch('requests.get')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)@patch('server.routes.integration.jira_dc._handle_workspace_link_creation',@@ -268,8 +327,6 @@ async def test_jira_dc_callback_redirects_with_webhook_install_failure(mock_register_webhook,mock_handle_link,mock_manager,- mock_get,- mock_post,mock_redis,mock_request,):@@ -286,14 +343,13 @@ async def test_jira_dc_callback_redirects_with_webhook_install_failure('state': state,}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- mock_get.return_value = MagicMock(- status_code=200,- json=lambda: {'key': 'jira_user_123'},- text='Success',++ # Set up httpx mock+ httpx_mock = create_httpx_mock(+ post_response={'access_token': 'token'},+ get_response={'key': 'jira_user_123'},)+mock_manager.integration_store.get_workspace_by_name.return_value = Nonemock_workspace = MagicMock(id=1)mock_manager.integration_store.create_workspace.return_value = mock_workspace@@ -304,9 +360,9 @@ async def test_jira_dc_callback_redirects_with_webhook_install_failure('server.routes.integration.jira_dc.JIRA_DC_BASE_URL','https://test.atlassian.net',):- mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'-- response = await jira_dc_callback(mock_request, 'code', state)+ with patch('httpx.AsyncClient', return_value=httpx_mock):+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'+ response = await jira_dc_callback(mock_request, 'code', state)assert isinstance(response, RedirectResponse)assert response.status_code == status.HTTP_302_FOUND@@ -323,15 +379,13 @@ async def test_jira_dc_callback_redirects_with_webhook_install_failure(@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-@patch('requests.get')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)@patch('server.routes.integration.jira_dc._handle_workspace_link_creation',new_callable=AsyncMock,)async def test_jira_dc_callback_token_exchange_uses_form_encoding(- mock_handle_link, mock_manager, mock_get, mock_post, mock_redis, mock_request+ mock_handle_link, mock_manager, mock_redis, mock_request):"""Token exchange must POST `application/x-www-form-urlencoded`, not JSON.@@ -354,26 +408,39 @@ async def test_jira_dc_callback_token_exchange_uses_form_encoding('state': state,}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- mock_get.return_value = MagicMock(- status_code=200, json=lambda: {'key': 'jira_user_123'}, text=''- )mock_manager.integration_store.get_workspace_by_name.return_value = None+ # Create a mock that captures POST call arguments+ mock_post_response = MagicMock()+ mock_post_response.status_code = 200+ mock_post_response.json.return_value = {'access_token': 'token'}+ mock_post_response.text = ''++ mock_get_response = MagicMock()+ mock_get_response.status_code = 200+ mock_get_response.json.return_value = {'key': 'jira_user_123'}++ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)+ mock_client.get = AsyncMock(return_value=mock_get_response)++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)+with patch('server.routes.integration.jira_dc.token_manager') as mock_token_manager:with patch('server.routes.integration.jira_dc.JIRA_DC_BASE_URL','https://test.atlassian.net',):- mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'+ with patch('httpx.AsyncClient', return_value=mock_httpx):+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'- # Act- await jira_dc_callback(mock_request, code, state)+ # Act+ await jira_dc_callback(mock_request, code, state)# Assert: token POST is form-encoded (data=), not JSON (json=).- kwargs = mock_post.call_args.kwargs+ kwargs = mock_client.post.call_args.kwargsassert kwargs.get('data', {}).get('grant_type') == 'authorization_code'assert 'json' not in kwargs@@ -1180,99 +1247,115 @@ async def test_jira_dc_callback_state_mismatch(mock_redis, mock_request):@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-async def test_jira_dc_callback_token_fetch_failure(- mock_post, mock_redis, mock_request-):+async def test_jira_dc_callback_token_fetch_failure(mock_redis, mock_request):session_data = {'state': 'test_state'}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(status_code=400, text='Token error')- with pytest.raises(HTTPException) as exc_info:- await jira_dc_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 400- assert 'Error fetching token' in exc_info.value.detail+ # Create httpx mock with failing POST response+ mock_post_response = MagicMock()+ mock_post_response.status_code = 400+ mock_post_response.text = 'Token error'++ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)++ with patch('httpx.AsyncClient', return_value=mock_httpx):+ with pytest.raises(HTTPException) as exc_info:+ await jira_dc_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 400+ assert 'Error fetching token' in exc_info.value.detail@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-@patch('requests.get')-async def test_jira_dc_callback_resources_fetch_failure(- mock_get, mock_post, mock_redis, mock_request-):+async def test_jira_dc_callback_resources_fetch_failure(mock_redis, mock_request):session_data = {'state': 'test_state'}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- mock_get.return_value = MagicMock(status_code=400, text='Resources error')- with pytest.raises(HTTPException) as exc_info:- await jira_dc_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 400- assert 'Error fetching user info: Resources error' in exc_info.value.detail+ # Create httpx mock with successful POST but failing GET+ mock_post_response = MagicMock()+ mock_post_response.status_code = 200+ mock_post_response.json.return_value = {'access_token': 'token'}++ mock_get_response = MagicMock()+ mock_get_response.status_code = 400+ mock_get_response.text = 'Resources error'++ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)+ mock_client.get = AsyncMock(return_value=mock_get_response)++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)++ with patch('httpx.AsyncClient', return_value=mock_httpx):+ with pytest.raises(HTTPException) as exc_info:+ await jira_dc_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 400+ assert 'Error fetching user info: Resources error' in exc_info.value.detail@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-@patch('requests.get')-async def test_jira_dc_callback_unauthorized_workspace(- mock_get, mock_post, mock_redis, mock_request-):+async def test_jira_dc_callback_unauthorized_workspace(mock_redis, mock_request):session_data = {'state': 'test_state','target_workspace': 'target.atlassian.net','keycloak_user_id': 'user1',}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- # Set up different responses for different GET requests- def mock_get_side_effect(url, **kwargs):+ # Create httpx mock with different URL for accessible-resources+ mock_post_response = MagicMock()+ mock_post_response.status_code = 200+ mock_post_response.json.return_value = {'access_token': 'token'}++ mock_get_response = MagicMock()+ mock_get_response.status_code = 200+ mock_get_response.json.return_value = [{'url': 'https://different.atlassian.net'}]++ mock_get_user_response = MagicMock()+ mock_get_user_response.status_code = 200+ mock_get_user_response.json.return_value = {'key': 'jira_user_123'}++ async def mock_get(url, **kwargs):if 'accessible-resources' in url:- return MagicMock(- status_code=200,- json=lambda: [{'url': 'https://different.atlassian.net'}],- text='Success',- )- elif (- 'api.atlassian.com/me' in url or url.endswith('/myself') or 'myself' in url- ):- return MagicMock(- status_code=200,- json=lambda: {'key': 'jira_user_123'},- text='Success',- )- else:- return MagicMock(status_code=404, text='Not found')+ return mock_get_response+ return mock_get_user_response- mock_get.side_effect = mock_get_side_effect+ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)+ mock_client.get = AsyncMock(side_effect=mock_get)++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)with patch('server.routes.integration.jira_dc.JIRA_DC_BASE_URL','https://target.atlassian.net',):- with pytest.raises(HTTPException) as exc_info:- await jira_dc_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 400- assert 'Invalid operation type' in exc_info.value.detail+ with patch('httpx.AsyncClient', return_value=mock_httpx):+ with pytest.raises(HTTPException) as exc_info:+ await jira_dc_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 400+ assert 'Invalid operation type' in exc_info.value.detail@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-@patch('requests.get')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)@patch('server.routes.integration.jira_dc._handle_workspace_link_creation',new_callable=AsyncMock,)async def test_jira_dc_callback_workspace_integration_existing_workspace(- mock_handle_link, mock_manager, mock_get, mock_post, mock_redis, mock_request+ mock_handle_link, mock_manager, mock_redis, mock_request):state = 'test_state'session_data = {@@ -1286,28 +1369,15 @@ async def test_jira_dc_callback_workspace_integration_existing_workspace('state': state,}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- # Set up different responses for different GET requests- def mock_get_side_effect(url, **kwargs):- if 'accessible-resources' in url:- return MagicMock(- status_code=200,- json=lambda: [{'url': 'https://existing.atlassian.net'}],- text='Success',- )- elif 'api.atlassian.com/me' in url or url.endswith('/myself'):- return MagicMock(- status_code=200,- json=lambda: {'key': 'jira_user_123'},- text='Success',- )- else:- return MagicMock(status_code=404, text='Not found')-- mock_get.side_effect = mock_get_side_effect+ # Set up httpx mock with conditional GET responses+ httpx_mock = create_httpx_mock(+ post_response={'access_token': 'token'},+ get_responses={+ 'accessible-resources': [{'url': 'https://existing.atlassian.net'}],+ '/myself': {'key': 'jira_user_123'},+ },+ )# Mock existing workspacemock_workspace = MagicMock(id=1)@@ -1319,67 +1389,52 @@ async def test_jira_dc_callback_workspace_integration_existing_workspace('server.routes.integration.jira_dc.JIRA_DC_BASE_URL','https://existing.atlassian.net',):- with patch(- 'server.routes.integration.jira_dc._validate_workspace_update_permissions'- ) as mock_validate:- mock_validate.return_value = mock_workspace- mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'+ with patch('httpx.AsyncClient', return_value=httpx_mock):+ with patch(+ 'server.routes.integration.jira_dc._validate_workspace_update_permissions'+ ) as mock_validate:+ mock_validate.return_value = mock_workspace+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'- response = await jira_dc_callback(mock_request, 'code', state)+ response = await jira_dc_callback(mock_request, 'code', state)- assert isinstance(response, RedirectResponse)- assert response.status_code == status.HTTP_302_FOUND- mock_manager.integration_store.update_workspace.assert_called_once()- mock_handle_link.assert_called_once_with(- 'user1', 'jira_user_123', 'existing.atlassian.net'- )+ assert isinstance(response, RedirectResponse)+ assert response.status_code == status.HTTP_302_FOUND+ mock_manager.integration_store.update_workspace.assert_called_once()+ mock_handle_link.assert_called_once_with(+ 'user1', 'jira_user_123', 'existing.atlassian.net'+ )@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.redis_client')-@patch('requests.post')-@patch('requests.get')-async def test_jira_dc_callback_invalid_operation_type(- mock_get, mock_post, mock_redis, mock_request-):+async def test_jira_dc_callback_invalid_operation_type(mock_redis, mock_request):session_data = {'operation_type': 'invalid_operation','target_workspace': 'test.atlassian.net',- 'keycloak_user_id': 'user1', # Add missing field+ 'keycloak_user_id': 'user1','state': 'test_state',}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- # Set up different responses for different GET requests- def mock_get_side_effect(url, **kwargs):- if 'accessible-resources' in url:- return MagicMock(- status_code=200,- json=lambda: [{'url': 'https://test.atlassian.net'}],- text='Success',- )- elif 'api.atlassian.com/me' in url or url.endswith('/myself'):- return MagicMock(- status_code=200,- json=lambda: {'key': 'jira_user_123'},- text='Success',- )- else:- return MagicMock(status_code=404, text='Not found')-- mock_get.side_effect = mock_get_side_effect+ # Set up httpx mock (though it won't be called due to invalid operation type check)+ httpx_mock = create_httpx_mock(+ post_response={'access_token': 'token'},+ get_responses={+ 'accessible-resources': [{'url': 'https://test.atlassian.net'}],+ '/myself': {'key': 'jira_user_123'},+ },+ )with patch('server.routes.integration.jira_dc.JIRA_DC_BASE_URL','https://test.atlassian.net',):- with pytest.raises(HTTPException) as exc_info:- await jira_dc_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 400- assert 'Invalid operation type' in exc_info.value.detail+ with patch('httpx.AsyncClient', return_value=httpx_mock):+ with pytest.raises(HTTPException) as exc_info:+ await jira_dc_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 400+ assert 'Invalid operation type' in exc_info.value.detail# Test get_current_workspace_link error scenariosdiff --git a/enterprise/tests/unit/server/routes/test_jira_integration_routes.py b/enterprise/tests/unit/server/routes/test_jira_integration_routes.pyindex 4a95ef27c1..3bf4d26cde 100644--- a/enterprise/tests/unit/server/routes/test_jira_integration_routes.py+++ b/enterprise/tests/unit/server/routes/test_jira_integration_routes.py@@ -1,6 +1,7 @@import hashlibimport hmacimport json+from contextlib import asynccontextmanagerfrom datetime import datetimefrom unittest.mock import AsyncMock, MagicMock, patch@@ -25,6 +26,70 @@ from server.routes.integration.jira import ()+def create_httpx_mock(post_response=None, get_response=None, get_responses=None):+ """Create a mock for httpx.AsyncClient.++ Args:+ post_response: Response for POST requests. Can be a dict (JSON body) or+ a MagicMock for full control.+ get_response: Default response for GET requests. Can be a dict (JSON body) or+ a MagicMock for full control.+ get_responses: Dict of URL pattern -> response for conditional GET responses.+ e.g. {'accessible-resources': {...}, '/me': {...}}++ Returns:+ AsyncMock that can be used as httpx.AsyncClient context manager.+ """+ mock_response = MagicMock()+ mock_response.status_code = 200+ mock_response.json.return_value = {'access_token': 'token'}++ if isinstance(post_response, dict):+ mock_post_response = MagicMock()+ mock_post_response.status_code = 200+ mock_post_response.json.return_value = post_response+ else:+ mock_post_response = post_response or mock_response++ # Create mock client with post/get methods+ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)+ mock_client.get = AsyncMock(return_value=mock_response)++ # Set up conditional GET responses if provided+ if get_responses:++ async def mock_get(url, **kwargs):+ for pattern, resp in get_responses.items():+ if pattern in url:+ mock_resp = MagicMock()+ mock_resp.status_code = 200+ mock_resp.json.return_value = resp+ return mock_resp+ # Default response for unmatched URLs+ default_resp = MagicMock()+ default_resp.status_code = 404+ default_resp.json.return_value = {}+ return default_resp++ mock_client.get = AsyncMock(side_effect=mock_get)+ elif isinstance(get_response, dict):+ mock_get_response = MagicMock()+ mock_get_response.status_code = 200+ mock_get_response.json.return_value = get_response+ mock_client.get = AsyncMock(return_value=mock_get_response)++ # Create the AsyncClient context manager mock+ @asynccontextmanager+ async def mock_async_client():+ yield mock_client++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)+ return mock_httpx++@pytest.fixturedef mock_request():req = MagicMock(spec=Request)@@ -146,15 +211,13 @@ async def test_create_workspace_link_success(@pytest.mark.asyncio@patch('server.routes.integration.jira.redis_client')-@patch('requests.post')-@patch('requests.get')@patch('server.routes.integration.jira.jira_manager', new_callable=AsyncMock)@patch('server.routes.integration.jira._handle_workspace_link_creation',new_callable=AsyncMock,)async def test_jira_callback_workspace_integration_new_workspace(- mock_handle_link, mock_manager, mock_get, mock_post, mock_redis, mock_request+ mock_handle_link, mock_manager, mock_redis, mock_request):state = 'test_state'code = 'test_code'@@ -169,40 +232,29 @@ async def test_jira_callback_workspace_integration_new_workspace('state': state,}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- # Set up different responses for different GET requests- def mock_get_side_effect(url, **kwargs):- if 'accessible-resources' in url:- return MagicMock(- status_code=200,- json=lambda: [{'url': 'https://test.atlassian.net'}],- text='Success',- )- elif 'api.atlassian.com/me' in url or url.endswith('/me'):- return MagicMock(- status_code=200,- json=lambda: {'account_id': 'jira_user_123'},- text='Success',- )- else:- return MagicMock(status_code=404, text='Not found')+ # Set up httpx mock with conditional GET responses+ httpx_mock = create_httpx_mock(+ post_response={'access_token': 'token'},+ get_responses={+ 'accessible-resources': [{'url': 'https://test.atlassian.net'}],+ '/me': {'account_id': 'jira_user_123'},+ },+ )- mock_get.side_effect = mock_get_side_effectmock_manager.integration_store.get_workspace_by_name.return_value = Nonewith patch('server.routes.integration.jira.token_manager') as mock_token_manager:- mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'- response = await jira_callback(mock_request, code, state)-- assert isinstance(response, RedirectResponse)- assert response.status_code == status.HTTP_302_FOUND- mock_manager.integration_store.create_workspace.assert_called_once()- mock_handle_link.assert_called_once_with(- 'user1', 'jira_user_123', 'test.atlassian.net'- )+ with patch('httpx.AsyncClient', return_value=httpx_mock):+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'+ response = await jira_callback(mock_request, code, state)++ assert isinstance(response, RedirectResponse)+ assert response.status_code == status.HTTP_302_FOUND+ mock_manager.integration_store.create_workspace.assert_called_once()+ mock_handle_link.assert_called_once_with(+ 'user1', 'jira_user_123', 'test.atlassian.net'+ )@pytest.mark.asyncio@@ -735,72 +787,98 @@ async def test_jira_callback_state_mismatch(mock_redis, mock_request):@pytest.mark.asyncio@patch('server.routes.integration.jira.redis_client')-@patch('requests.post')-async def test_jira_callback_token_fetch_failure(mock_post, mock_redis, mock_request):+async def test_jira_callback_token_fetch_failure(mock_redis, mock_request):session_data = {'state': 'test_state'}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(status_code=400, text='Token error')- with pytest.raises(HTTPException) as exc_info:- await jira_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 400- assert 'Error fetching token' in exc_info.value.detail+ # Create httpx mock with failing POST response+ mock_post_response = MagicMock()+ mock_post_response.status_code = 400+ mock_post_response.text = 'Token error'++ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)++ with patch('httpx.AsyncClient', return_value=mock_httpx):+ with pytest.raises(HTTPException) as exc_info:+ await jira_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 400+ assert 'Error fetching token' in exc_info.value.detail@pytest.mark.asyncio@patch('server.routes.integration.jira.redis_client')-@patch('requests.post')-@patch('requests.get')-async def test_jira_callback_resources_fetch_failure(- mock_get, mock_post, mock_redis, mock_request-):+async def test_jira_callback_resources_fetch_failure(mock_redis, mock_request):session_data = {'state': 'test_state'}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- mock_get.return_value = MagicMock(status_code=400, text='Resources error')- with pytest.raises(HTTPException) as exc_info:- await jira_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 400- assert 'Error fetching resources' in exc_info.value.detail+ # Create httpx mock with successful POST but failing GET+ mock_post_response = MagicMock()+ mock_post_response.status_code = 200+ mock_post_response.json.return_value = {'access_token': 'token'}++ mock_get_response = MagicMock()+ mock_get_response.status_code = 400+ mock_get_response.text = 'Resources error'++ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)+ mock_client.get = AsyncMock(return_value=mock_get_response)++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)++ with patch('httpx.AsyncClient', return_value=mock_httpx):+ with pytest.raises(HTTPException) as exc_info:+ await jira_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 400+ assert 'Error fetching resources' in exc_info.value.detail@pytest.mark.asyncio@patch('server.routes.integration.jira.redis_client')-@patch('requests.post')-@patch('requests.get')-async def test_jira_callback_unauthorized_workspace(- mock_get, mock_post, mock_redis, mock_request-):+async def test_jira_callback_unauthorized_workspace(mock_redis, mock_request):session_data = {'state': 'test_state', 'target_workspace': 'target.atlassian.net'}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- mock_get.return_value = MagicMock(- status_code=200,- json=lambda: [{'url': 'https://different.atlassian.net'}],- )- with pytest.raises(HTTPException) as exc_info:- await jira_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 401- assert 'User is not authorized to access workspace' in exc_info.value.detail+ # Create httpx mock with different URL for accessible-resources+ mock_post_response = MagicMock()+ mock_post_response.status_code = 200+ mock_post_response.json.return_value = {'access_token': 'token'}++ mock_get_response = MagicMock()+ mock_get_response.status_code = 200+ mock_get_response.json.return_value = [{'url': 'https://different.atlassian.net'}]++ mock_client = AsyncMock()+ mock_client.post = AsyncMock(return_value=mock_post_response)+ mock_client.get = AsyncMock(return_value=mock_get_response)++ mock_httpx = AsyncMock()+ mock_httpx.__aenter__ = AsyncMock(return_value=mock_client)+ mock_httpx.__aexit__ = AsyncMock(return_value=None)++ with patch('httpx.AsyncClient', return_value=mock_httpx):+ with pytest.raises(HTTPException) as exc_info:+ await jira_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 401+ assert 'User is not authorized to access workspace' in exc_info.value.detail@pytest.mark.asyncio@patch('server.routes.integration.jira.redis_client')-@patch('requests.post')-@patch('requests.get')@patch('server.routes.integration.jira.jira_manager', new_callable=AsyncMock)@patch('server.routes.integration.jira._handle_workspace_link_creation',new_callable=AsyncMock,)async def test_jira_callback_workspace_integration_existing_workspace(- mock_handle_link, mock_manager, mock_get, mock_post, mock_redis, mock_request+ mock_handle_link, mock_manager, mock_redis, mock_request):state = 'test_state'session_data = {@@ -814,91 +892,63 @@ async def test_jira_callback_workspace_integration_existing_workspace('state': state,}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- # Set up different responses for different GET requests- def mock_get_side_effect(url, **kwargs):- if 'accessible-resources' in url:- return MagicMock(- status_code=200,- json=lambda: [{'url': 'https://existing.atlassian.net'}],- text='Success',- )- elif 'api.atlassian.com/me' in url or url.endswith('/me'):- return MagicMock(- status_code=200,- json=lambda: {'account_id': 'jira_user_123'},- text='Success',- )- else:- return MagicMock(status_code=404, text='Not found')-- mock_get.side_effect = mock_get_side_effect+ # Set up httpx mock with conditional GET responses+ httpx_mock = create_httpx_mock(+ post_response={'access_token': 'token'},+ get_responses={+ 'accessible-resources': [{'url': 'https://existing.atlassian.net'}],+ '/me': {'account_id': 'jira_user_123'},+ },+ )# Mock existing workspacemock_workspace = MagicMock(id=1)mock_manager.integration_store.get_workspace_by_name.return_value = mock_workspacewith patch('server.routes.integration.jira.token_manager') as mock_token_manager:- with patch(- 'server.routes.integration.jira._validate_workspace_update_permissions'- ) as mock_validate:- mock_validate.return_value = mock_workspace- mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'+ with patch('httpx.AsyncClient', return_value=httpx_mock):+ with patch(+ 'server.routes.integration.jira._validate_workspace_update_permissions'+ ) as mock_validate:+ mock_validate.return_value = mock_workspace+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'- response = await jira_callback(mock_request, 'code', state)+ response = await jira_callback(mock_request, 'code', state)- assert isinstance(response, RedirectResponse)- assert response.status_code == status.HTTP_302_FOUND- mock_manager.integration_store.update_workspace.assert_called_once()- mock_handle_link.assert_called_once_with(- 'user1', 'jira_user_123', 'existing.atlassian.net'- )+ assert isinstance(response, RedirectResponse)+ assert response.status_code == status.HTTP_302_FOUND+ mock_manager.integration_store.update_workspace.assert_called_once()+ mock_handle_link.assert_called_once_with(+ 'user1', 'jira_user_123', 'existing.atlassian.net'+ )@pytest.mark.asyncio@patch('server.routes.integration.jira.redis_client')-@patch('requests.post')-@patch('requests.get')-async def test_jira_callback_invalid_operation_type(- mock_get, mock_post, mock_redis, mock_request-):+async def test_jira_callback_invalid_operation_type(mock_redis, mock_request):session_data = {'operation_type': 'invalid_operation','target_workspace': 'test.atlassian.net',- 'keycloak_user_id': 'user1', # Add missing field+ 'keycloak_user_id': 'user1','state': 'test_state',}mock_redis.get.return_value = json.dumps(session_data)- mock_post.return_value = MagicMock(- status_code=200, json=lambda: {'access_token': 'token'}- )- # Set up different responses for different GET requests- def mock_get_side_effect(url, **kwargs):- if 'accessible-resources' in url:- return MagicMock(- status_code=200,- json=lambda: [{'url': 'https://test.atlassian.net'}],- text='Success',- )- elif 'api.atlassian.com/me' in url or url.endswith('/me'):- return MagicMock(- status_code=200,- json=lambda: {'account_id': 'jira_user_123'},- text='Success',- )- else:- return MagicMock(status_code=404, text='Not found')-- mock_get.side_effect = mock_get_side_effect+ # Set up httpx mock (though it won't be called due to invalid operation type check)+ httpx_mock = create_httpx_mock(+ post_response={'access_token': 'token'},+ get_responses={+ 'accessible-resources': [{'url': 'https://test.atlassian.net'}],+ '/me': {'account_id': 'jira_user_123'},+ },+ )- with pytest.raises(HTTPException) as exc_info:- await jira_callback(mock_request, 'code', 'test_state')- assert exc_info.value.status_code == 400- assert 'Invalid operation type' in exc_info.value.detail+ with patch('httpx.AsyncClient', return_value=httpx_mock):+ with pytest.raises(HTTPException) as exc_info:+ await jira_callback(mock_request, 'code', 'test_state')+ assert exc_info.value.status_code == 400+ assert 'Invalid operation type' in exc_info.value.detail# Test get_current_workspace_link error scenariosdiff --git a/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py b/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.pyindex 06f72b8826..dcaaf2d0b9 100644--- a/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py+++ b/enterprise/tests/unit/storage/test_saas_sql_app_conversation_info_service.py@@ -397,17 +397,17 @@ class TestSaasSQLAppConversationInfoService:# User should NOT see org1's conversations after switching to org2page_in_org2 = await user1_service_org2.search_app_conversation_info()- assert (- len(page_in_org2.items) == 0- ), 'User should not see conversations from org1 after switching to org2'+ assert len(page_in_org2.items) == 0, (+ 'User should not see conversations from org1 after switching to org2'+ )# User should not be able to get the specific conversation from org1conv_from_org2 = await user1_service_org2.get_app_conversation_info(conv_in_org1.id)- assert (- conv_from_org2 is None- ), 'User should not be able to access org1 conversation from org2'+ assert conv_from_org2 is None, (+ 'User should not be able to access org1 conversation from org2'+ )# Now create a conversation in org2conv_in_org2 = AppConversationInfo(@@ -524,15 +524,15 @@ class TestSaasSQLAppConversationInfoServiceAdminContext:# ADMIN should see ALL conversations (unfiltered)admin_page = await admin_service.search_app_conversation_info()- assert (- len(admin_page.items) == 3- ), 'ADMIN context should see all conversations without filtering'+ assert len(admin_page.items) == 3, (+ 'ADMIN context should see all conversations without filtering'+ )# ADMIN count should return total count (3)admin_count = await admin_service.count_app_conversation_info()- assert (- admin_count == 3- ), 'ADMIN context should count all conversations without filtering'+ assert admin_count == 3, (+ 'ADMIN context should count all conversations without filtering'+ )@pytest.mark.asyncioasync def test_admin_context_can_access_any_conversation(@@ -602,12 +602,12 @@ class TestSaasSQLAppConversationInfoServiceAdminContext:# For ADMIN, there should be no user_id or org_id filtering# The query should not contain filters for user_id or org_id- assert str(USER1_ID) not in query_str.replace(- '-', ''- ), 'ADMIN context should not filter by user_id'- assert str(USER2_ID) not in query_str.replace(- '-', ''- ), 'ADMIN context should not filter by user_id'+ assert str(USER1_ID) not in query_str.replace('-', ''), (+ 'ADMIN context should not filter by user_id'+ )+ assert str(USER2_ID) not in query_str.replace('-', ''), (+ 'ADMIN context should not filter by user_id'+ )@pytest.mark.asyncioasync def test_regular_user_context_filters_correctly(@@ -712,9 +712,9 @@ class TestSaasSQLAppConversationInfoServiceWebhookFallback:saas_metadata = result.scalar_one_or_none()assert saas_metadata is not None, 'SAAS metadata should be created'- assert (- saas_metadata.user_id == USER1_ID- ), 'user_id should match info.created_by_user_id'+ assert saas_metadata.user_id == USER1_ID, (+ 'user_id should match info.created_by_user_id'+ )assert saas_metadata.org_id == ORG1_ID, 'org_id should match user current org'@pytest.mark.asyncio@@ -754,9 +754,9 @@ class TestSaasSQLAppConversationInfoServiceWebhookFallback:result = await async_session_with_users.execute(saas_query)saas_metadata = result.scalar_one_or_none()- assert (- saas_metadata is None- ), 'SAAS metadata should not be created without user_id'+ assert saas_metadata is None, (+ 'SAAS metadata should not be created without user_id'+ )@pytest.mark.asyncioasync def test_webhook_created_conversation_visible_to_user(@@ -1086,9 +1086,9 @@ class TestApiKeyOrgIdHandling:assert saas_metadata is not None, 'SAAS metadata should be created'assert saas_metadata.user_id == USER1_ID- assert (- saas_metadata.org_id == ORG1_ID- ), 'Conversation should be in API key org (ORG1), not user current org (ORG2)'+ assert saas_metadata.org_id == ORG1_ID, (+ 'Conversation should be in API key org (ORG1), not user current org (ORG2)'+ )@pytest.mark.asyncioasync def test_legacy_api_key_without_org_uses_user_current_org(@@ -1163,9 +1163,9 @@ class TestApiKeyOrgIdHandling:assert saas_metadata is not None, 'SAAS metadata should be created'assert saas_metadata.user_id == USER1_ID- assert (- saas_metadata.org_id == ORG1_ID- ), 'Legacy key should fall back to user current org (ORG1)'+ assert saas_metadata.org_id == ORG1_ID, (+ 'Legacy key should fall back to user current org (ORG1)'+ )@pytest.mark.asyncioasync def test_cookie_auth_without_api_key_uses_user_current_org(@@ -1208,9 +1208,9 @@ class TestApiKeyOrgIdHandling:assert saas_metadata is not None, 'SAAS metadata should be created'assert saas_metadata.user_id == USER1_ID- assert (- saas_metadata.org_id == ORG1_ID- ), 'Cookie auth should use user current org (ORG1)'+ assert saas_metadata.org_id == ORG1_ID, (+ 'Cookie auth should use user current org (ORG1)'+ )@pytest.mark.asyncioasync def test_api_key_org_isolation_cross_org_visibility(@@ -1288,15 +1288,15 @@ class TestApiKeyOrgIdHandling:user_context=SpecifyUserContext(user_id=str(USER1_ID)),)page_org2 = await user_service_org2.search_app_conversation_info()- assert (- len(page_org2.items) == 0- ), 'User in ORG2 should not see conversation created via API key in ORG1'+ assert len(page_org2.items) == 0, (+ 'User in ORG2 should not see conversation created via API key in ORG1'+ )# Also verify get_app_conversation_info returns Noneconv_from_org2 = await user_service_org2.get_app_conversation_info(conv_id)- assert (- conv_from_org2 is None- ), 'User in ORG2 should not access conversation from ORG1'+ assert conv_from_org2 is None, (+ 'User in ORG2 should not access conversation from ORG1'+ )# Step 4: Switch user back to ORG1result = await async_session_with_users.execute(@@ -1313,9 +1313,9 @@ class TestApiKeyOrgIdHandling:user_context=SpecifyUserContext(user_id=str(USER1_ID)),)page_org1 = await user_service_org1.search_app_conversation_info()- assert (- len(page_org1.items) == 1- ), 'User in ORG1 should see conversation created via API key in ORG1'+ assert len(page_org1.items) == 1, (+ 'User in ORG1 should see conversation created via API key in ORG1'+ )assert page_org1.items[0].id == conv_idassert page_org1.items[0].title == 'E2E API Key Conversation'diff --git a/enterprise/tests/unit/storage/test_saas_stores_effective_org.py b/enterprise/tests/unit/storage/test_saas_stores_effective_org.pyindex 85e8f4cb11..c91b1f9816 100644--- a/enterprise/tests/unit/storage/test_saas_stores_effective_org.py+++ b/enterprise/tests/unit/storage/test_saas_stores_effective_org.py@@ -246,9 +246,9 @@ async def test_secrets_store_store_uses_effective_org_id_when_set():):await store.store(item)- assert captured_org_ids == [- EFFECTIVE_ORG_ID- ], f'store() wrote under {captured_org_ids[0]!s}, expected {EFFECTIVE_ORG_ID!s}'+ assert captured_org_ids == [EFFECTIVE_ORG_ID], (+ f'store() wrote under {captured_org_ids[0]!s}, expected {EFFECTIVE_ORG_ID!s}'+ )@pytest.mark.asynciodiff --git a/enterprise/tests/unit/test_auth_middleware.py b/enterprise/tests/unit/test_auth_middleware.pyindex 240d9ce9a2..c25dcfa7b1 100644--- a/enterprise/tests/unit/test_auth_middleware.py+++ b/enterprise/tests/unit/test_auth_middleware.py@@ -274,12 +274,15 @@ async def test_logout_skips_keycloak_for_bearer_auth():bearer_user_auth.auth_type = AuthType.BEARERbearer_user_auth.refresh_token = SecretStr('the-users-offline-token')- with patch(- 'server.middleware.get_user_auth',- new=AsyncMock(return_value=bearer_user_auth),- ), patch(- 'server.middleware.token_manager.logout', new=AsyncMock()- ) as mock_kc_logout:+ with (+ patch(+ 'server.middleware.get_user_auth',+ new=AsyncMock(return_value=bearer_user_auth),+ ),+ patch(+ 'server.middleware.token_manager.logout', new=AsyncMock()+ ) as mock_kc_logout,+ ):await middleware._logout(mock_request)mock_kc_logout.assert_not_called()@@ -300,12 +303,15 @@ async def test_logout_invokes_keycloak_for_cookie_auth():cookie_user_auth.auth_type = AuthType.COOKIEcookie_user_auth.refresh_token = SecretStr('cookie-refresh-token')- with patch(- 'server.middleware.get_user_auth',- new=AsyncMock(return_value=cookie_user_auth),- ), patch(- 'server.middleware.token_manager.logout', new=AsyncMock()- ) as mock_kc_logout:+ with (+ patch(+ 'server.middleware.get_user_auth',+ new=AsyncMock(return_value=cookie_user_auth),+ ),+ patch(+ 'server.middleware.token_manager.logout', new=AsyncMock()+ ) as mock_kc_logout,+ ):await middleware._logout(mock_request)mock_kc_logout.assert_awaited_once_with('cookie-refresh-token')diff --git a/enterprise/tests/unit/test_lite_llm_manager.py b/enterprise/tests/unit/test_lite_llm_manager.pyindex c8245e2b25..d4f3fc469b 100644--- a/enterprise/tests/unit/test_lite_llm_manager.py+++ b/enterprise/tests/unit/test_lite_llm_manager.py@@ -2532,9 +2532,9 @@ class TestBudgetPayloadHandling:# Verify that max_budget IS in the JSON payload with the correct valuejson_payload = call_args[1]['json']- assert (- 'max_budget' in json_payload- ), 'max_budget should be in payload when set to a value'+ assert 'max_budget' in json_payload, (+ 'max_budget should be in payload when set to a value'+ )assert json_payload['max_budget'] == 100.0@pytest.mark.asyncio@@ -2593,9 +2593,9 @@ class TestBudgetPayloadHandling:# Verify that max_budget_in_team IS in the JSON payloadjson_payload = call_args[1]['json']- assert (- 'max_budget_in_team' in json_payload- ), 'max_budget_in_team should be in payload when set to a value'+ assert 'max_budget_in_team' in json_payload, (+ 'max_budget_in_team should be in payload when set to a value'+ )assert json_payload['max_budget_in_team'] == 50.0@pytest.mark.asyncio@@ -2654,9 +2654,9 @@ class TestBudgetPayloadHandling:# Verify that max_budget_in_team IS in the JSON payloadjson_payload = call_args[1]['json']- assert (- 'max_budget_in_team' in json_payload- ), 'max_budget_in_team should be in payload when set to a value'+ assert 'max_budget_in_team' in json_payload, (+ 'max_budget_in_team should be in payload when set to a value'+ )assert json_payload['max_budget_in_team'] == 75.0diff --git a/enterprise/tests/unit/test_logger.py b/enterprise/tests/unit/test_logger.pyindex 25f2937736..e07b32c859 100644--- a/enterprise/tests/unit/test_logger.py+++ b/enterprise/tests/unit/test_logger.py@@ -339,9 +339,9 @@ class TestLogOutput:assert 'ts' in outputassert 'timestamp' not in output# Verify 'ts' appears only once in the raw output (not duplicated as key)- assert (- raw_output.count('"ts"') == 1- ), f"'ts' should appear exactly once, found in: {raw_output}"+ assert raw_output.count('"ts"') == 1, (+ f"'ts' should appear exactly once, found in: {raw_output}"+ )assert output['message'] == 'Test both modes message'assert output['severity'] == 'INFO'# When LOG_JSON_FOR_CONSOLE=1, custom_json_serializer uses datetime.now().isoformat()diff --git a/enterprise/tests/unit/test_org_member_store.py b/enterprise/tests/unit/test_org_member_store.pyindex fc0916d5f0..9ba0d4dcc1 100644--- a/enterprise/tests/unit/test_org_member_store.py+++ b/enterprise/tests/unit/test_org_member_store.py@@ -1239,9 +1239,9 @@ async def test_update_all_members_settings_async_replaces_mcp_config(assert len(mcp_servers) == 2, f'Expected 2 servers, got {len(mcp_servers)}'assert 'server1' in mcp_serversassert 'server2' in mcp_servers- assert (- 'server3' not in mcp_servers- ), 'Deleted server was resurrected by deep_merge'+ assert 'server3' not in mcp_servers, (+ 'Deleted server was resurrected by deep_merge'+ )@pytest.mark.asynciodiff --git a/enterprise/tests/unit/test_saas_server.py b/enterprise/tests/unit/test_saas_server.pyindex a6f8bb448b..36115b32c1 100644--- a/enterprise/tests/unit/test_saas_server.py+++ b/enterprise/tests/unit/test_saas_server.py@@ -14,7 +14,7 @@ def test_oauth_callback_route_precedes_spa_mount(tmp_path):env = os.environ.copy()env['FRONTEND_DIRECTORY'] = str(frontend_build)env['PYTHONPATH'] = (- f"{repo_root / 'enterprise'}:{repo_root}:{env.get('PYTHONPATH', '')}"+ f'{repo_root / "enterprise"}:{repo_root}:{env.get("PYTHONPATH", "")}')env['OPENHANDS_SUPPRESS_BANNER'] = '1'env['POSTHOG_CLIENT_KEY'] = 'test-posthog-key'diff --git a/enterprise/tests/unit/test_user_store.py b/enterprise/tests/unit/test_user_store.pyindex 9fbb540551..95124233e4 100644--- a/enterprise/tests/unit/test_user_store.py+++ b/enterprise/tests/unit/test_user_store.py@@ -1279,9 +1279,9 @@ async def test_migrate_user_sql_type_handling(async_session_maker):))saas_metadata = result.scalars().first()- assert (- saas_metadata is not None- ), 'conversation_metadata_saas record should exist'+ assert saas_metadata is not None, (+ 'conversation_metadata_saas record should exist'+ )assert saas_metadata.user_id == user_uuid, 'user_id should be UUID type'assert saas_metadata.org_id == user_uuid, 'org_id should be UUID type'@@ -1291,9 +1291,9 @@ async def test_migrate_user_sql_type_handling(async_session_maker):)stripe_record = result.scalars().first()assert stripe_record is not None- assert (- stripe_record.org_id == user_uuid- ), 'stripe_customers.org_id should be UUID'+ assert stripe_record.org_id == user_uuid, (+ 'stripe_customers.org_id should be UUID'+ )# Verify slack_users org_id was setresult = await session.execute(@@ -1301,9 +1301,9 @@ async def test_migrate_user_sql_type_handling(async_session_maker):)slack_user_record = result.scalars().first()assert slack_user_record is not None- assert (- slack_user_record.org_id == user_uuid- ), 'slack_users.org_id should be UUID'+ assert slack_user_record.org_id == user_uuid, (+ 'slack_users.org_id should be UUID'+ )# Verify slack_conversation org_id was setresult = await session.execute(@@ -1313,9 +1313,9 @@ async def test_migrate_user_sql_type_handling(async_session_maker):)slack_conv_record = result.scalars().first()assert slack_conv_record is not None- assert (- slack_conv_record.org_id == user_uuid- ), 'slack_conversation.org_id should be UUID'+ assert slack_conv_record.org_id == user_uuid, (+ 'slack_conversation.org_id should be UUID'+ )# Verify api_keys org_id was setresult = await session.execute(select(ApiKey).filter(ApiKey.user_id == user_id))@@ -1331,9 +1331,9 @@ async def test_migrate_user_sql_type_handling(async_session_maker):)custom_secret_record = result.scalars().first()assert custom_secret_record is not None- assert (- custom_secret_record.org_id == user_uuid- ), 'custom_secrets.org_id should be UUID'+ assert custom_secret_record.org_id == user_uuid, (+ 'custom_secrets.org_id should be UUID'+ )# Verify billing_sessions org_id was setresult = await session.execute(@@ -1341,9 +1341,9 @@ async def test_migrate_user_sql_type_handling(async_session_maker):)billing_record = result.scalars().first()assert billing_record is not None- assert (- billing_record.org_id == user_uuid- ), 'billing_sessions.org_id should be UUID'+ assert billing_record.org_id == user_uuid, (+ 'billing_sessions.org_id should be UUID'+ )@pytest.mark.asyncio@@ -1410,9 +1410,9 @@ async def test_migrate_user_sql_no_matching_records(async_session_maker):))records = result.scalars().all()- assert (- len(records) == 0- ), 'No records should be created for non-matching user_id'+ assert len(records) == 0, (+ 'No records should be created for non-matching user_id'+ )@pytest.mark.asyncio@@ -1457,9 +1457,9 @@ async def test_migrate_user_sql_multiple_conversations(async_session_maker):text('SELECT conversation_id, user_id FROM conversation_metadata'))conv_rows = result.fetchall()- assert (- len(conv_rows) == 3- ), f'Expected 3 conversation_metadata rows, got {len(conv_rows)}'+ assert len(conv_rows) == 3, (+ f'Expected 3 conversation_metadata rows, got {len(conv_rows)}'+ )# Execute migration SQLawait session.execute(@@ -1491,12 +1491,12 @@ async def test_migrate_user_sql_multiple_conversations(async_session_maker):# Verify the user_id and org_id valuesfor row in saas_rows:- assert (- row.user_id == user_uuid_str- ), f'user_id should match: {row.user_id} vs {user_uuid_str}'- assert (- row.org_id == user_uuid_str- ), f'org_id should match: {row.org_id} vs {user_uuid_str}'+ assert row.user_id == user_uuid_str, (+ f'user_id should match: {row.user_id} vs {user_uuid_str}'+ )+ assert row.org_id == user_uuid_str, (+ f'org_id should match: {row.org_id} vs {user_uuid_str}'+ )# Note: The v1_enabled logic in migrate_user follows the same pattern as OrgStore.create_org:diff --git a/enterprise/tests/unit/test_utils.py b/enterprise/tests/unit/test_utils.pyindex c3e0e6408e..5a7c69fa1e 100644--- a/enterprise/tests/unit/test_utils.py+++ b/enterprise/tests/unit/test_utils.py@@ -64,9 +64,9 @@ def test_markdown_to_jira_markup():for markdown, expected in test_cases:result = markdown_to_jira_markup(markdown)- assert (- result == expected- ), f'Failed for {repr(markdown)}: got {repr(result)}, expected {repr(expected)}'+ assert result == expected, (+ f'Failed for {repr(markdown)}: got {repr(result)}, expected {repr(expected)}'+ )def test_infer_repo_from_message():@@ -191,6 +191,6 @@ def test_infer_repo_from_message():for message, expected in test_cases:result = infer_repo_from_message(message)- assert (- result == expected- ), f'Failed for {repr(message)}: got {repr(result)}, expected {repr(expected)}'+ assert result == expected, (+ f'Failed for {repr(message)}: got {repr(result)}, expected {repr(expected)}'+ )