Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Remove socketio from app server communications (#14200)

Tim O'Farrell4925d91e0bc7
diff --git a/enterprise/integrations/slack/slack_manager.py b/enterprise/integrations/slack/slack_manager.py
index 741c839d03..77afa5b141 100644
--- a/enterprise/integrations/slack/slack_manager.py
+++ b/enterprise/integrations/slack/slack_manager.py
@@ -28,6 +28,7 @@ from slack_sdk.oauth import AuthorizeUrlGenerator
from slack_sdk.web.async_client import AsyncWebClient
from sqlalchemy import select
from storage.database import a_session_maker
+from storage.redis import get_redis_client_async
from storage.slack_user import SlackUser
from openhands.app_server.integrations.provider import ProviderHandler
@@ -38,7 +39,7 @@ from openhands.app_server.integrations.service_types import (
)
from openhands.app_server.user_auth.user_auth import UserAuth
from openhands.core.logger import openhands_logger as logger
-from openhands.server.shared import config, server_config, sio
+from openhands.server.shared import config, server_config
from openhands.server.types import (
LLMAuthenticationError,
MissingSettingsError,
@@ -114,7 +115,7 @@ class SlackManager(Manager[SlackViewInterface]):
"""
key = f'{SLACK_USER_MSG_KEY_PREFIX}:{message_ts}:{thread_ts}'
try:
- redis = sio.manager.redis
+ redis = get_redis_client_async()
await redis.set(key, user_msg, ex=SLACK_USER_MSG_EXPIRATION)
logger.info(
'slack_stored_user_msg',
@@ -157,7 +158,7 @@ class SlackManager(Manager[SlackViewInterface]):
"""
key = f'{SLACK_USER_MSG_KEY_PREFIX}:{message_ts}:{thread_ts}'
try:
- redis = sio.manager.redis
+ redis = get_redis_client_async()
user_msg = await redis.get(key)
if user_msg:
# Redis returns bytes, decode to string
diff --git a/enterprise/saas_server.py b/enterprise/saas_server.py
index aeb95d3c06..16f3b3901d 100644
--- a/enterprise/saas_server.py
+++ b/enterprise/saas_server.py
@@ -8,7 +8,6 @@ load_dotenv()
if not os.getenv('OPENHANDS_CONFIG_CLS'):
os.environ['OPENHANDS_CONFIG_CLS'] = 'server.config.SaaSServerConfig'
-import socketio # noqa: E402
from fastapi import Request, status # noqa: E402
from fastapi.middleware.cors import CORSMiddleware # noqa: E402
from fastapi.responses import JSONResponse # noqa: E402
@@ -61,7 +60,6 @@ from server.verified_models.verified_model_router import ( # noqa: E402
)
from openhands.server.app import app as base_app # noqa: E402
-from openhands.server.listen_socket import sio # noqa: E402
from openhands.server.middleware import ( # noqa: E402
CacheControlMiddleware,
)
@@ -178,4 +176,5 @@ async def expired_exception_handler(request: Request, exc: ExpiredError):
return JSONResponse({'error': ExpiredError.__name__}, status.HTTP_401_UNAUTHORIZED)
-app = socketio.ASGIApp(sio, other_asgi_app=base_app)
+# Note: socketio is no longer used for communication. The base FastAPI app is used directly.
+app = base_app
diff --git a/enterprise/server/routes/integration/gitlab.py b/enterprise/server/routes/integration/gitlab.py
index 1cdb5d32bc..05efd215e4 100644
--- a/enterprise/server/routes/integration/gitlab.py
+++ b/enterprise/server/routes/integration/gitlab.py
@@ -18,11 +18,11 @@ from pydantic import BaseModel
from server.auth.token_manager import TokenManager
from storage.gitlab_webhook import GitlabWebhook
from storage.gitlab_webhook_store import GitlabWebhookStore
+from storage.redis import get_redis_client_async
from openhands.app_server.integrations.gitlab.gitlab_service import GitLabServiceImpl
from openhands.app_server.user_auth import get_user_id
from openhands.core.logger import openhands_logger as logger
-from openhands.server.shared import sio
gitlab_integration_router = APIRouter(prefix='/integration')
webhook_store = GitlabWebhookStore()
@@ -103,7 +103,7 @@ async def gitlab_events(
dedup_hash = hashlib.sha256(dedup_json.encode()).hexdigest()
dedup_key = f'gitlab_msg: {dedup_hash}'
- redis = sio.manager.redis
+ redis = get_redis_client_async()
created = await redis.set(dedup_key, 1, nx=True, ex=60)
if not created:
logger.info('gitlab_is_duplicate')
diff --git a/enterprise/server/routes/integration/jira.py b/enterprise/server/routes/integration/jira.py
index 79ad740ef9..5c1884a7fd 100644
--- a/enterprise/server/routes/integration/jira.py
+++ b/enterprise/server/routes/integration/jira.py
@@ -18,7 +18,7 @@ from server.auth.constants import JIRA_CLIENT_ID, JIRA_CLIENT_SECRET
from server.auth.saas_user_auth import SaasUserAuth
from server.auth.token_manager import TokenManager
from storage.jira_workspace import JiraWorkspace
-from storage.redis import create_redis_client
+from storage.redis import get_redis_client
from openhands.app_server.user_auth.user_auth import get_user_auth
from openhands.core.logger import openhands_logger as logger
@@ -123,7 +123,7 @@ class JiraValidateWorkspaceResponse(BaseModel):
jira_integration_router = APIRouter(prefix='/integration/jira')
token_manager = TokenManager()
jira_manager = JiraManager(token_manager)
-redis_client = create_redis_client()
+redis_client = get_redis_client()
async def verify_jira_signature(body: bytes, signature: str, payload: dict):
diff --git a/enterprise/server/routes/integration/jira_dc.py b/enterprise/server/routes/integration/jira_dc.py
index b7cd014823..29cdfb3a94 100644
--- a/enterprise/server/routes/integration/jira_dc.py
+++ b/enterprise/server/routes/integration/jira_dc.py
@@ -26,7 +26,7 @@ from server.auth.constants import (
from server.auth.saas_user_auth import SaasUserAuth
from server.auth.token_manager import TokenManager
from server.constants import WEB_HOST
-from storage.redis import create_redis_client
+from storage.redis import get_redis_client
from openhands.app_server.user_auth.user_auth import get_user_auth
from openhands.core.logger import openhands_logger as logger
@@ -129,7 +129,7 @@ class JiraDcValidateWorkspaceResponse(BaseModel):
jira_dc_integration_router = APIRouter(prefix='/integration/jira-dc')
token_manager = TokenManager()
jira_dc_manager = JiraDcManager(token_manager)
-redis_client = create_redis_client()
+redis_client = get_redis_client()
async def _handle_workspace_link_creation(
diff --git a/enterprise/server/routes/integration/slack.py b/enterprise/server/routes/integration/slack.py
index c61fddf446..7ab4eaadba 100644
--- a/enterprise/server/routes/integration/slack.py
+++ b/enterprise/server/routes/integration/slack.py
@@ -35,6 +35,7 @@ from slack_sdk.signature import SignatureVerifier
from slack_sdk.web.async_client import AsyncWebClient
from sqlalchemy import delete
from storage.database import a_session_maker
+from storage.redis import get_redis_client_async
from storage.slack_team_store import SlackTeamStore
from storage.slack_user import SlackUser
from storage.user_store import UserStore
@@ -43,7 +44,7 @@ from openhands.app_server.integrations.service_types import (
ProviderTimeoutError,
ProviderType,
)
-from openhands.server.shared import config, sio
+from openhands.server.shared import config
signature_verifier = SignatureVerifier(signing_secret=SLACK_SIGNING_SECRET)
slack_router = APIRouter(prefix='/slack')
@@ -327,7 +328,7 @@ async def on_event(request: Request, background_tasks: BackgroundTasks):
team_id = payload['team_id']
# Sometimes slack sends duplicates, so we need to make sure this is not a duplicate.
- redis = sio.manager.redis
+ redis = get_redis_client_async()
key = f'slack_msg:{client_msg_id}'
created = await redis.set(key, 1, nx=True, ex=60)
if not created:
diff --git a/enterprise/server/routes/readiness.py b/enterprise/server/routes/readiness.py
index 996c9f64d7..97f53123b6 100644
--- a/enterprise/server/routes/readiness.py
+++ b/enterprise/server/routes/readiness.py
@@ -1,7 +1,7 @@
from fastapi import APIRouter, HTTPException, status
from sqlalchemy.sql import text
from storage.database import a_session_maker
-from storage.redis import create_redis_client
+from storage.redis import get_redis_client
from openhands.core.logger import openhands_logger as logger
@@ -23,7 +23,7 @@ async def is_ready():
# Check Redis connection
try:
- redis_client = create_redis_client()
+ redis_client = get_redis_client()
redis_client.ping()
except Exception as e:
logger.error(f'Redis check failed: {str(e)}')
diff --git a/enterprise/server/services/automation_event_service.py b/enterprise/server/services/automation_event_service.py
index 9279aa7a6f..c37ea08aaf 100644
--- a/enterprise/server/services/automation_event_service.py
+++ b/enterprise/server/services/automation_event_service.py
@@ -34,10 +34,10 @@ from server.auth.constants import (
AUTOMATION_WEBHOOK_SECRET,
)
from server.auth.token_manager import TokenManager
+from storage.redis import get_redis_client_async
from openhands.app_server.integrations.provider import ProviderType
from openhands.core.logger import openhands_logger as logger
-from openhands.server.shared import sio
# Cache TTL constants
ORG_CLAIM_CACHE_TTL_SECONDS = 3600 # 1 hour for org claims (rarely change)
@@ -382,16 +382,7 @@ class AutomationEventService:
Monitor logs for 'Redis unavailable' warnings to detect degradation.
"""
try:
- redis = getattr(sio.manager, 'redis', None)
- if not redis:
- # Log at warning level - this is a significant degradation that
- # will cause DB load. Monitor these logs for alerting.
- logger.warning(
- '[AutomationEventService] Redis unavailable for cache read, '
- 'falling back to direct DB queries (this will increase DB load)'
- )
- return None
-
+ redis = get_redis_client_async()
cached = await redis.get(cache_key)
if cached is None:
return None
@@ -415,11 +406,7 @@ class AutomationEventService:
Fails silently if Redis is unavailable (graceful degradation).
"""
try:
- redis = getattr(sio.manager, 'redis', None)
- if not redis:
- # Silent failure - read path already logs the warning
- return
-
+ redis = get_redis_client_async()
await redis.setex(cache_key, ttl_seconds, value)
except Exception as e:
# Log at warning level for visibility
diff --git a/enterprise/server/utils/rate_limit_utils.py b/enterprise/server/utils/rate_limit_utils.py
index 0d8d2d67cd..d06755335a 100644
--- a/enterprise/server/utils/rate_limit_utils.py
+++ b/enterprise/server/utils/rate_limit_utils.py
@@ -1,7 +1,7 @@
from fastapi import HTTPException, Request, status
+from storage.redis import get_redis_client_async
from openhands.core.logger import openhands_logger as logger
-from openhands.server.shared import sio
# Rate limiting constants
RATE_LIMIT_USER_SECONDS = 120 # 2 minutes per user_id
@@ -32,7 +32,7 @@ async def check_rate_limit_by_user_id(
HTTPException: If rate limit is exceeded (429 status code)
"""
try:
- redis = sio.manager.redis
+ redis = get_redis_client_async()
if not redis:
# If Redis is unavailable, log warning and allow request (fail open)
logger.warning('Redis unavailable for rate limiting, allowing request')
diff --git a/enterprise/storage/redis.py b/enterprise/storage/redis.py
index 3e43730bde..cc1869effc 100644
--- a/enterprise/storage/redis.py
+++ b/enterprise/storage/redis.py
@@ -1,23 +1,76 @@
import os
+import threading
-import redis
+from redis import Redis
+from redis import asyncio as aioredis
+from redis import exceptions as redis_exceptions
# Redis configuration
REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
REDIS_PORT = int(os.environ.get('REDIS_PORT', '6379'))
REDIS_PASSWORD = os.environ.get('REDIS_PASSWORD', '')
REDIS_DB = int(os.environ.get('REDIS_DB', '0'))
+REDIS_SOCKET_TIMEOUT = 2
+_redis_client: Redis | None = None
+_redis_client_async: aioredis.Redis | None = None
+_redis_lock = threading.Lock()
-def create_redis_client():
- return redis.Redis(
- host=REDIS_HOST,
- port=REDIS_PORT,
- password=REDIS_PASSWORD,
- db=REDIS_DB,
- socket_timeout=2,
- )
+
+def _get_redis_kwargs():
+ """Return common kwargs for Redis client creation."""
+ return {
+ 'host': REDIS_HOST,
+ 'port': REDIS_PORT,
+ 'password': REDIS_PASSWORD,
+ 'db': REDIS_DB,
+ 'socket_timeout': REDIS_SOCKET_TIMEOUT,
+ }
+
+
+def get_redis_client() -> Redis:
+ """Get a shared synchronous Redis client, lazily initialized.
+
+ Thread-safe with double-checked locking pattern.
+
+ Returns:
+ A Redis client for synchronous operations.
+ """
+ global _redis_client
+ if _redis_client is None:
+ with _redis_lock:
+ if _redis_client is None:
+ _redis_client = Redis(**_get_redis_kwargs())
+ return _redis_client
+
+
+def get_redis_client_async() -> aioredis.Redis:
+ """Get a shared asynchronous Redis client, lazily initialized.
+
+ Note: This function is synchronous but returns an async client.
+ Thread-safe initialization is handled via a threading lock since
+ asyncio.Lock cannot be used in a sync context.
+
+ Returns:
+ An aioredis client for asynchronous operations.
+ """
+ global _redis_client_async
+ if _redis_client_async is None:
+ with _redis_lock:
+ if _redis_client_async is None:
+ _redis_client_async = aioredis.Redis(**_get_redis_kwargs())
+ return _redis_client_async
def get_redis_authed_url():
return f'redis://:{REDIS_PASSWORD}@{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}'
+
+
+__all__ = [
+ 'Redis',
+ 'aioredis',
+ 'get_redis_client',
+ 'get_redis_client_async',
+ 'get_redis_authed_url',
+ 'redis_exceptions',
+]
diff --git a/enterprise/storage/user_store.py b/enterprise/storage/user_store.py
index 9bfe21088d..3812a6c7fa 100644
--- a/enterprise/storage/user_store.py
+++ b/enterprise/storage/user_store.py
@@ -109,10 +109,10 @@ class UserStore:
@staticmethod
def _get_redis_client():
- """Get the Redis client from the Socket.IO manager."""
- from openhands.server.shared import sio
+ """Get the shared async Redis client from enterprise storage."""
+ from storage.redis import get_redis_client_async
- return getattr(sio.manager, 'redis', None)
+ return get_redis_client_async()
@staticmethod
async def _acquire_user_creation_lock(user_id: str) -> bool:
@@ -121,19 +121,21 @@ class UserStore:
Returns True if the lock was acquired or if Redis is unavailable (fallback to no locking).
Returns False if another process holds the lock.
"""
+ from storage.redis import redis_exceptions
+
redis_client = UserStore._get_redis_client()
- if redis_client is None:
+ try:
+ user_key = f'{_REDIS_USER_CREATION_KEY_PREFIX}{user_id}'
+ lock_acquired = await redis_client.set(
+ user_key, 1, nx=True, ex=_REDIS_CREATE_TIMEOUT_SECONDS
+ )
+ return bool(lock_acquired)
+ except redis_exceptions.RedisError:
logger.warning(
- 'user_store:_acquire_user_creation_lock:no_redis_client',
+ 'user_store:_acquire_user_creation_lock:redis_error',
extra={'user_id': user_id},
)
- return True # Proceed without locking if Redis is unavailable
-
- user_key = f'{_REDIS_USER_CREATION_KEY_PREFIX}{user_id}'
- lock_acquired = await redis_client.set(
- user_key, 1, nx=True, ex=_REDIS_CREATE_TIMEOUT_SECONDS
- )
- return bool(lock_acquired)
+ return True # Proceed without locking on error
@staticmethod
async def _release_user_creation_lock(user_id: str) -> bool:
@@ -142,17 +144,19 @@ class UserStore:
Returns True if the lock was released or if Redis is unavailable.
Returns False if the lock could not be released.
"""
+ from storage.redis import redis_exceptions
+
redis_client = UserStore._get_redis_client()
- if redis_client is None:
+ try:
+ user_key = f'{_REDIS_USER_CREATION_KEY_PREFIX}{user_id}'
+ deleted = await redis_client.delete(user_key)
+ return bool(deleted)
+ except redis_exceptions.RedisError:
logger.warning(
- 'user_store:_release_user_creation_lock:no_redis_client',
+ 'user_store:_release_user_creation_lock:redis_error',
extra={'user_id': user_id},
)
- return True # Nothing to release if Redis is unavailable
-
- user_key = f'{_REDIS_USER_CREATION_KEY_PREFIX}{user_id}'
- deleted = await redis_client.delete(user_key)
- return bool(deleted)
+ return True # Proceed without locking on error
@staticmethod
async def migrate_user(
diff --git a/enterprise/tests/unit/server/services/test_automation_event_service.py b/enterprise/tests/unit/server/services/test_automation_event_service.py
index b08be34da7..fba9c618e3 100644
--- a/enterprise/tests/unit/server/services/test_automation_event_service.py
+++ b/enterprise/tests/unit/server/services/test_automation_event_service.py
@@ -17,6 +17,8 @@ import pytest
from openhands.app_server.integrations.service_types import ProviderType
+REDIS_PATCH = 'server.services.automation_event_service.get_redis_client_async'
+
# Default patches for constants
CONSTANT_PATCHES = {
'server.services.automation_event_service.AUTOMATION_WEBHOOK_SECRET': 'test-shared-secret',
@@ -91,10 +93,8 @@ def github_user_payload():
def create_service(mock_token_manager):
- """Helper to create a service with mocked sio and constants."""
- with patch('server.services.automation_event_service.sio'), patch.dict(
- 'os.environ', {}, clear=False
- ):
+ """Helper to create a service with mocked constants."""
+ with patch.dict('os.environ', {}, clear=False):
for key, value in CONSTANT_PATCHES.items():
patch(key, value).start()
@@ -123,9 +123,7 @@ class TestResolveGitOrg:
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
return_value=mock_org_git_claim.org_id,
- ), patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ ), patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._resolve_git_org(ProviderType.GITHUB, 'test-org')
@@ -147,11 +145,7 @@ class TestResolveGitOrg:
with patch(
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
- ) as mock_resolver, patch(
- 'server.services.automation_event_service.sio'
- ) as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ ) as mock_resolver, patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._resolve_git_org(ProviderType.GITHUB, 'test-org')
@@ -174,9 +168,7 @@ class TestResolveGitOrg:
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
return_value=None,
- ), patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ ), patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._resolve_git_org(
ProviderType.GITHUB, 'unclaimed-org'
@@ -202,11 +194,7 @@ class TestResolveGitOrg:
with patch(
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
- ) as mock_resolver, patch(
- 'server.services.automation_event_service.sio'
- ) as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ ) as mock_resolver, patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._resolve_git_org(
ProviderType.GITHUB, 'unclaimed-org'
@@ -232,9 +220,7 @@ class TestResolveGitOrg:
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
return_value=mock_org_git_claim.org_id,
- ), patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ ), patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
# Call for GitHub
@@ -264,9 +250,7 @@ class TestResolvePersonalOrg:
mock_redis.get = AsyncMock(return_value=None) # Cache miss
mock_redis.setex = AsyncMock()
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._resolve_personal_org(ProviderType.GITHUB, 12345)
@@ -284,9 +268,7 @@ class TestResolvePersonalOrg:
mock_redis = AsyncMock()
mock_redis.get = AsyncMock(return_value=keycloak_id.encode())
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._resolve_personal_org(ProviderType.GITHUB, 12345)
@@ -324,9 +306,7 @@ class TestResolvePersonalOrg:
mock_redis.get = AsyncMock(return_value=None)
mock_redis.setex = AsyncMock()
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
# Call for GitHub
@@ -359,15 +339,11 @@ class TestForwardEvent:
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
return_value=mock_org_git_claim.org_id,
- ), patch(
- 'server.services.automation_event_service.sio'
- ) as mock_sio, patch.object(
+ ), patch(REDIS_PATCH, return_value=mock_redis), patch.object(
AutomationEventService,
'_send_to_automation_service',
new_callable=AsyncMock,
) as mock_send:
- mock_sio.manager.redis = mock_redis
-
service = AutomationEventService(mock_token_manager)
await service.forward_event(
provider=ProviderType.GITHUB,
@@ -411,15 +387,11 @@ class TestForwardEvent:
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
return_value=None, # No org claim for personal repo
- ), patch(
- 'server.services.automation_event_service.sio'
- ) as mock_sio, patch.object(
+ ), patch(REDIS_PATCH, return_value=mock_redis), patch.object(
AutomationEventService,
'_send_to_automation_service',
new_callable=AsyncMock,
) as mock_send:
- mock_sio.manager.redis = mock_redis
-
service = AutomationEventService(mock_token_manager)
await service.forward_event(
provider=ProviderType.GITHUB,
@@ -450,7 +422,7 @@ class TestForwardEvent:
'sender': {'id': 12345, 'login': 'testuser'},
}
- with patch('server.services.automation_event_service.sio'), patch(
+ with patch(
'server.services.automation_event_service.logger'
) as mock_logger, patch.object(
AutomationEventService,
@@ -487,15 +459,13 @@ class TestForwardEvent:
'server.services.automation_event_service.resolve_org_for_repo',
new_callable=AsyncMock,
return_value=None,
- ), patch('server.services.automation_event_service.sio') as mock_sio, patch(
+ ), patch(REDIS_PATCH, return_value=mock_redis), patch(
'server.services.automation_event_service.logger'
) as mock_logger, patch.object(
AutomationEventService,
'_send_to_automation_service',
new_callable=AsyncMock,
) as mock_send:
- mock_sio.manager.redis = mock_redis
-
service = AutomationEventService(mock_token_manager)
await service.forward_event(
provider=ProviderType.GITHUB,
@@ -608,7 +578,7 @@ class TestSendToAutomationService:
with patch(
'server.services.automation_event_service.AUTOMATION_SERVICE_URL',
'https://automation.example.com',
- ), patch('server.services.automation_event_service.sio'), patch(
+ ), patch(
'server.services.automation_event_service.aiohttp.ClientSession',
return_value=mock_session_context,
):
@@ -653,7 +623,7 @@ class TestSendToAutomationService:
with patch(
'server.services.automation_event_service.AUTOMATION_SERVICE_URL',
'https://automation.example.com',
- ), patch('server.services.automation_event_service.sio'), patch(
+ ), patch(
'server.services.automation_event_service.aiohttp.ClientSession',
return_value=mock_session_context,
):
@@ -678,9 +648,7 @@ class TestSendToAutomationService:
with patch(
'server.services.automation_event_service.AUTOMATION_SERVICE_URL', None
- ), patch('server.services.automation_event_service.sio'), patch(
- 'server.services.automation_event_service.logger'
- ) as mock_logger:
+ ), patch('server.services.automation_event_service.logger') as mock_logger:
service = create_service(mock_token_manager)
await service._send_to_automation_service(
ProviderType.GITHUB, org_id, payload
@@ -702,7 +670,7 @@ class TestSignPayload:
with patch(
'server.services.automation_event_service.AUTOMATION_WEBHOOK_SECRET',
'test-shared-secret',
- ), patch('server.services.automation_event_service.sio'):
+ ):
service = create_service(mock_token_manager)
payload_bytes = b'{"test": "data"}'
@@ -734,7 +702,7 @@ class TestSignPayload:
with patch(
'server.services.automation_event_service.AUTOMATION_WEBHOOK_SECRET',
shared_secret,
- ), patch('server.services.automation_event_service.sio'):
+ ):
service = create_service(mock_token_manager)
signature = service._sign_payload(payload_bytes)
@@ -754,9 +722,7 @@ class TestCacheHelpers:
mock_redis = AsyncMock()
mock_redis.get = AsyncMock(return_value=b'cached-value')
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._get_cached_value('test-key')
@@ -772,9 +738,7 @@ class TestCacheHelpers:
mock_redis = AsyncMock()
mock_redis.get = AsyncMock(return_value=None)
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
result = await service._get_cached_value('test-key')
@@ -787,9 +751,7 @@ class TestCacheHelpers:
WHEN: _get_cached_value is called
THEN: None is returned (graceful degradation)
"""
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = None
-
+ with patch(REDIS_PATCH, return_value=None):
service = create_service(mock_token_manager)
result = await service._get_cached_value('test-key')
@@ -805,9 +767,7 @@ class TestCacheHelpers:
mock_redis = AsyncMock()
mock_redis.setex = AsyncMock()
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
service = create_service(mock_token_manager)
await service._set_cached_value('test-key', 'test-value', 3600)
@@ -820,9 +780,7 @@ class TestCacheHelpers:
WHEN: _set_cached_value is called
THEN: No error is raised (silent failure)
"""
- with patch('server.services.automation_event_service.sio') as mock_sio:
- mock_sio.manager.redis = None
-
+ with patch(REDIS_PATCH, return_value=None):
service = create_service(mock_token_manager)
# Should not raise
await service._set_cached_value('test-key', 'test-value', 3600)
diff --git a/enterprise/tests/unit/server/test_rate_limit_utils.py b/enterprise/tests/unit/server/test_rate_limit_utils.py
index 37c83bc6c8..3a32aff04c 100644
--- a/enterprise/tests/unit/server/test_rate_limit_utils.py
+++ b/enterprise/tests/unit/server/test_rate_limit_utils.py
@@ -8,6 +8,8 @@ from server.utils.rate_limit_utils import (
check_rate_limit_by_user_id,
)
+REDIS_PATCH = 'server.utils.rate_limit_utils.get_redis_client_async'
+
@pytest.fixture
def mock_request():
@@ -34,11 +36,9 @@ async def test_rate_limit_by_user_id_first_request_succeeds(mock_request, mock_r
key_prefix = 'email_resend'
with (
- patch('server.utils.rate_limit_utils.sio') as mock_sio,
+ patch(REDIS_PATCH, return_value=mock_redis),
patch('server.utils.rate_limit_utils.logger') as mock_logger,
):
- mock_sio.manager.redis = mock_redis
-
# Act
await check_rate_limit_by_user_id(
request=mock_request, key_prefix=key_prefix, user_id=user_id
@@ -63,11 +63,9 @@ async def test_rate_limit_by_user_id_second_request_within_window_fails(
mock_redis.set = AsyncMock(return_value=False) # Key already exists
with (
- patch('server.utils.rate_limit_utils.sio') as mock_sio,
+ patch(REDIS_PATCH, return_value=mock_redis),
patch('server.utils.rate_limit_utils.logger') as mock_logger,
):
- mock_sio.manager.redis = mock_redis
-
# Act & Assert
with pytest.raises(HTTPException) as exc_info:
await check_rate_limit_by_user_id(
@@ -87,11 +85,9 @@ async def test_rate_limit_by_ip_when_user_id_is_none(mock_request, mock_redis):
key_prefix = 'email_resend'
with (
- patch('server.utils.rate_limit_utils.sio') as mock_sio,
+ patch(REDIS_PATCH, return_value=mock_redis),
patch('server.utils.rate_limit_utils.logger') as mock_logger,
):
- mock_sio.manager.redis = mock_redis
-
# Act
await check_rate_limit_by_user_id(
request=mock_request, key_prefix=key_prefix, user_id=None
@@ -116,11 +112,7 @@ async def test_rate_limit_by_ip_second_request_within_window_fails(
key_prefix = 'email_resend'
mock_redis.set = AsyncMock(return_value=False) # Key already exists
- with (
- patch('server.utils.rate_limit_utils.sio') as mock_sio,
- ):
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
# Act & Assert
with pytest.raises(HTTPException) as exc_info:
await check_rate_limit_by_user_id(
@@ -139,11 +131,9 @@ async def test_rate_limit_redis_unavailable_fails_open(mock_request):
user_id = 'test_user_id'
with (
- patch('server.utils.rate_limit_utils.sio') as mock_sio,
+ patch(REDIS_PATCH, return_value=None),
patch('server.utils.rate_limit_utils.logger') as mock_logger,
):
- mock_sio.manager.redis = None # Redis unavailable
-
# Act
await check_rate_limit_by_user_id(
request=mock_request, key_prefix=key_prefix, user_id=user_id
@@ -164,11 +154,9 @@ async def test_rate_limit_redis_exception_fails_open(mock_request, mock_redis):
mock_redis.set = AsyncMock(side_effect=Exception('Redis connection error'))
with (
- patch('server.utils.rate_limit_utils.sio') as mock_sio,
+ patch(REDIS_PATCH, return_value=mock_redis),
patch('server.utils.rate_limit_utils.logger') as mock_logger,
):
- mock_sio.manager.redis = mock_redis
-
# Act
await check_rate_limit_by_user_id(
request=mock_request, key_prefix=key_prefix, user_id=user_id
@@ -186,9 +174,7 @@ async def test_rate_limit_custom_key_prefix(mock_request, mock_redis):
user_id = 'test_user_id'
key_prefix = 'password_reset'
- with patch('server.utils.rate_limit_utils.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
# Act
await check_rate_limit_by_user_id(
request=mock_request, key_prefix=key_prefix, user_id=user_id
@@ -209,9 +195,7 @@ async def test_rate_limit_custom_rate_limit_seconds(mock_request, mock_redis):
custom_user_seconds = 60
custom_ip_seconds = 180
- with patch('server.utils.rate_limit_utils.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
# Act
await check_rate_limit_by_user_id(
request=mock_request,
@@ -234,9 +218,7 @@ async def test_rate_limit_ip_with_unknown_client(mock_request, mock_redis):
key_prefix = 'email_resend'
mock_request.client = None # No client information
- with patch('server.utils.rate_limit_utils.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
# Act
await check_rate_limit_by_user_id(
request=mock_request, key_prefix=key_prefix, user_id=None
@@ -258,9 +240,7 @@ async def test_rate_limit_different_users_have_separate_limits(
user_id_1 = 'user_1'
user_id_2 = 'user_2'
- with patch('server.utils.rate_limit_utils.sio') as mock_sio:
- mock_sio.manager.redis = mock_redis
-
+ with patch(REDIS_PATCH, return_value=mock_redis):
# Act
await check_rate_limit_by_user_id(
request=mock_request, key_prefix=key_prefix, user_id=user_id_1
diff --git a/enterprise/tests/unit/test_gitlab_resolver.py b/enterprise/tests/unit/test_gitlab_resolver.py
index 6258270346..9fa90f4daa 100644
--- a/enterprise/tests/unit/test_gitlab_resolver.py
+++ b/enterprise/tests/unit/test_gitlab_resolver.py
@@ -15,9 +15,9 @@ from server.routes.integration.gitlab import gitlab_events
@pytest.mark.asyncio
@patch('server.routes.integration.gitlab.verify_gitlab_signature')
@patch('server.routes.integration.gitlab.gitlab_manager')
-@patch('server.routes.integration.gitlab.sio')
+@patch('server.routes.integration.gitlab.get_redis_client_async')
async def test_gitlab_events_deduplication_with_object_id(
- mock_sio, mock_gitlab_manager, mock_verify_signature
+ mock_get_redis_client_async, mock_gitlab_manager, mock_verify_signature
):
"""Test that duplicate GitLab events are deduplicated using object_attributes.id."""
# Setup mocks
@@ -26,7 +26,7 @@ async def test_gitlab_events_deduplication_with_object_id(
# Mock Redis
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# First request - Redis returns True (key was set)
mock_redis.set.return_value = True
@@ -90,9 +90,9 @@ async def test_gitlab_events_deduplication_with_object_id(
@pytest.mark.asyncio
@patch('server.routes.integration.gitlab.verify_gitlab_signature')
@patch('server.routes.integration.gitlab.gitlab_manager')
-@patch('server.routes.integration.gitlab.sio')
+@patch('server.routes.integration.gitlab.get_redis_client_async')
async def test_gitlab_events_deduplication_without_object_id(
- mock_sio, mock_gitlab_manager, mock_verify_signature
+ mock_get_redis_client_async, mock_gitlab_manager, mock_verify_signature
):
"""Test that GitLab events without object_attributes.id are deduplicated using hash of payload."""
# Setup mocks
@@ -101,7 +101,7 @@ async def test_gitlab_events_deduplication_without_object_id(
# Mock Redis
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# First request - Redis returns True (key was set)
mock_redis.set.return_value = True
@@ -170,9 +170,9 @@ async def test_gitlab_events_deduplication_without_object_id(
@pytest.mark.asyncio
@patch('server.routes.integration.gitlab.verify_gitlab_signature')
@patch('server.routes.integration.gitlab.gitlab_manager')
-@patch('server.routes.integration.gitlab.sio')
+@patch('server.routes.integration.gitlab.get_redis_client_async')
async def test_gitlab_events_different_payloads_not_deduplicated(
- mock_sio, mock_gitlab_manager, mock_verify_signature
+ mock_get_redis_client_async, mock_gitlab_manager, mock_verify_signature
):
"""Test that different GitLab events are not deduplicated."""
# Setup mocks
@@ -181,7 +181,7 @@ async def test_gitlab_events_different_payloads_not_deduplicated(
# Mock Redis
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
mock_redis.set.return_value = True # Always return True for this test
# First payload with ID 123
@@ -240,9 +240,9 @@ async def test_gitlab_events_different_payloads_not_deduplicated(
@pytest.mark.asyncio
@patch('server.routes.integration.gitlab.verify_gitlab_signature')
@patch('server.routes.integration.gitlab.gitlab_manager')
-@patch('server.routes.integration.gitlab.sio')
+@patch('server.routes.integration.gitlab.get_redis_client_async')
async def test_gitlab_events_multiple_identical_payloads_deduplicated(
- mock_sio, mock_gitlab_manager, mock_verify_signature
+ mock_get_redis_client_async, mock_gitlab_manager, mock_verify_signature
):
"""Test that multiple identical GitLab events are properly deduplicated."""
# Setup mocks
@@ -251,7 +251,7 @@ async def test_gitlab_events_multiple_identical_payloads_deduplicated(
# Mock Redis
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# Create a payload with object_attributes.id
payload = {
diff --git a/enterprise/tests/unit/test_slack_integration.py b/enterprise/tests/unit/test_slack_integration.py
index 5c812ee564..1cb51614f8 100644
--- a/enterprise/tests/unit/test_slack_integration.py
+++ b/enterprise/tests/unit/test_slack_integration.py
@@ -89,21 +89,21 @@ def test_infer_repo_from_message(message, expected):
class TestRepoVerificationHandling:
"""Test repo verification handling for Slack integration."""
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
@patch('integrations.slack.slack_manager.ProviderHandler')
@patch.object(SlackManager, 'send_message', new_callable=AsyncMock)
async def test_timeout_during_verification_shows_selector(
self,
mock_send_message,
mock_provider_handler_class,
- mock_sio,
+ mock_get_redis_client_async,
slack_manager,
slack_new_conversation_view,
):
"""Test that when repo verification times out, selector is shown."""
# Setup Redis mock
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# Setup: Modify message to include exactly one repo reference to trigger verification
slack_new_conversation_view.user_msg = 'Help me with OpenHands/OpenHands repo'
@@ -132,12 +132,12 @@ class TestRepoVerificationHandling:
assert isinstance(selector_message, dict)
assert selector_message.get('text') == 'Choose a Repository:'
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
@patch.object(SlackManager, 'send_message', new_callable=AsyncMock)
async def test_no_repo_mentioned_shows_button_and_dropdown(
self,
mock_send_message,
- mock_sio,
+ mock_get_redis_client_async,
slack_manager,
slack_new_conversation_view,
):
@@ -149,7 +149,7 @@ class TestRepoVerificationHandling:
"""
# Setup Redis mock
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# Setup: user message without any repo mention
slack_new_conversation_view.user_msg = 'Hello, can you help me?'
@@ -189,10 +189,10 @@ class TestRepoVerificationHandling:
assert elements[1].get('action_id').startswith('repository_select:')
@pytest.mark.asyncio
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
async def test_no_repository_button_click_processes_correctly(
self,
- mock_sio,
+ mock_get_redis_client_async,
slack_manager,
):
"""Test that clicking 'No Repository' button correctly processes the interaction.
@@ -202,7 +202,7 @@ class TestRepoVerificationHandling:
"""
# Setup: Mock Redis to return a stored user message
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
stored_msg = json.dumps({'text': 'Hello, help me with code', 'user': 'U123'})
mock_redis.get = AsyncMock(return_value=stored_msg)
@@ -236,14 +236,14 @@ class TestRepoVerificationHandling:
assert call_args.message['message_ts'] == '1234567890.123456'
assert call_args.message['thread_ts'] is None
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
@patch('integrations.slack.slack_manager.ProviderHandler')
@patch.object(SlackManager, 'send_message', new_callable=AsyncMock)
async def test_verified_repo_starts_job(
self,
mock_send_message,
mock_provider_handler_class,
- mock_sio,
+ mock_get_redis_client_async,
slack_manager,
slack_new_conversation_view,
):
@@ -251,7 +251,7 @@ class TestRepoVerificationHandling:
# Setup Redis mock
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# Setup: Modify message to include exactly one repo reference
slack_new_conversation_view.user_msg = 'Help me with OpenHands/OpenHands repo'
@@ -532,13 +532,18 @@ class TestUserMsgStorage:
],
ids=['with_thread', 'without_thread', 'different_timestamps'],
)
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
async def test_store_user_msg_for_form(
- self, mock_sio, slack_manager, message_ts, thread_ts, user_msg
+ self,
+ mock_get_redis_client_async,
+ slack_manager,
+ message_ts,
+ thread_ts,
+ user_msg,
):
"""Test storing user message in Redis with various timestamp combinations."""
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# Should not raise an exception on success
await slack_manager._store_user_msg_for_form(message_ts, thread_ts, user_msg)
@@ -557,16 +562,16 @@ class TestUserMsgStorage:
],
ids=['connection_error', 'timeout_error', 'generic_exception'],
)
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
async def test_store_user_msg_for_form_redis_failure(
- self, mock_sio, slack_manager, exception_type, exception_msg
+ self, mock_get_redis_client_async, slack_manager, exception_type, exception_msg
):
"""Test that Redis failures during store raise SlackError."""
from integrations.slack.slack_errors import SlackError, SlackErrorCode
mock_redis = AsyncMock()
mock_redis.set.side_effect = exception_type(exception_msg)
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
message_ts = '1234567890.123456'
thread_ts = '1234567890.111111'
@@ -591,14 +596,18 @@ class TestUserMsgStorage:
],
ids=['bytes_response', 'string_response'],
)
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
async def test_retrieve_user_msg_for_form(
- self, mock_sio, slack_manager, redis_return_value, expected_result
+ self,
+ mock_get_redis_client_async,
+ slack_manager,
+ redis_return_value,
+ expected_result,
):
"""Test retrieving user message from Redis with various response types."""
mock_redis = AsyncMock()
mock_redis.get.return_value = redis_return_value
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
message_ts = '1234567890.123456'
thread_ts = '1234567890.111111'
@@ -609,16 +618,16 @@ class TestUserMsgStorage:
mock_redis.get.assert_called_once_with(expected_key)
assert result == expected_result
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
async def test_retrieve_user_msg_for_form_key_not_found(
- self, mock_sio, slack_manager
+ self, mock_get_redis_client_async, slack_manager
):
"""Test that missing key raises SlackError with SESSION_EXPIRED."""
from integrations.slack.slack_errors import SlackError, SlackErrorCode
mock_redis = AsyncMock()
mock_redis.get.return_value = None
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
message_ts = '1234567890.123456'
thread_ts = '1234567890.111111'
@@ -637,16 +646,16 @@ class TestUserMsgStorage:
],
ids=['connection_error', 'timeout_error'],
)
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
async def test_retrieve_user_msg_for_form_redis_failure(
- self, mock_sio, slack_manager, exception_type, exception_msg
+ self, mock_get_redis_client_async, slack_manager, exception_type, exception_msg
):
"""Test that Redis failures during retrieve raise SlackError."""
from integrations.slack.slack_errors import SlackError, SlackErrorCode
mock_redis = AsyncMock()
mock_redis.get.side_effect = exception_type(exception_msg)
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
message_ts = '1234567890.123456'
thread_ts = '1234567890.111111'
@@ -661,18 +670,18 @@ class TestUserMsgStorage:
class TestIsJobRequestedWithUserMsgStorage:
"""Test that is_job_requested properly stores user message for form flow."""
- @patch('integrations.slack.slack_manager.sio')
+ @patch('integrations.slack.slack_manager.get_redis_client_async')
@patch.object(SlackManager, 'send_message', new_callable=AsyncMock)
async def test_stores_user_msg_when_showing_repo_selector(
self,
mock_send_message,
- mock_sio,
+ mock_get_redis_client_async,
slack_manager,
slack_new_conversation_view,
):
"""Test that user_msg is stored in Redis when repo selector is shown."""
mock_redis = AsyncMock()
- mock_sio.manager.redis = mock_redis
+ mock_get_redis_client_async.return_value = mock_redis
# Setup: user message without any repo mention (no repo inferred)
slack_new_conversation_view.user_msg = 'Hello, can you help me?'
diff --git a/enterprise/tests/unit/test_user_store.py b/enterprise/tests/unit/test_user_store.py
index d043f9694f..2997ede789 100644
--- a/enterprise/tests/unit/test_user_store.py
+++ b/enterprise/tests/unit/test_user_store.py
@@ -1020,9 +1020,14 @@ def test_create_user_settings_from_entities_with_org_fallback():
@pytest.mark.asyncio
-async def test_acquire_user_creation_lock_no_redis():
- """Test that _acquire_user_creation_lock returns True when Redis is unavailable."""
- with patch.object(UserStore, '_get_redis_client', return_value=None):
+async def test_acquire_user_creation_lock_redis_error():
+ """Test that _acquire_user_creation_lock returns True when Redis has an error."""
+ from redis import exceptions as redis_exceptions
+
+ mock_redis = AsyncMock()
+ mock_redis.set.side_effect = redis_exceptions.RedisError('Connection refused')
+
+ with patch.object(UserStore, '_get_redis_client', return_value=mock_redis):
result = await UserStore._acquire_user_creation_lock('test-user-id')
assert result is True
@@ -1054,9 +1059,14 @@ async def test_acquire_user_creation_lock_not_acquired():
@pytest.mark.asyncio
-async def test_release_user_creation_lock_no_redis():
- """Test that _release_user_creation_lock returns True when Redis is unavailable."""
- with patch.object(UserStore, '_get_redis_client', return_value=None):
+async def test_release_user_creation_lock_redis_error():
+ """Test that _release_user_creation_lock returns True when Redis has an error."""
+ from redis import exceptions as redis_exceptions
+
+ mock_redis = AsyncMock()
+ mock_redis.delete.side_effect = redis_exceptions.RedisError('Connection refused')
+
+ with patch.object(UserStore, '_get_redis_client', return_value=mock_redis):
result = await UserStore._release_user_creation_lock('test-user-id')
assert result is True
diff --git a/openhands/server/listen.py b/openhands/server/listen.py
index a145bd8b39..f7360c5088 100644
--- a/openhands/server/listen.py
+++ b/openhands/server/listen.py
@@ -6,12 +6,10 @@
# Unless you are working on deprecation, please avoid extending this legacy file and consult the V1 codepaths above.
# Tag: Legacy-V0
# This module belongs to the old V0 web server. The V1 application server lives under openhands/app_server/.
-import os
-import socketio
+import os
from openhands.server.app import app as base_app
-from openhands.server.listen_socket import sio
from openhands.server.middleware import (
CacheControlMiddleware,
InMemoryRateLimiter,
@@ -32,4 +30,5 @@ base_app.add_middleware(
rate_limiter=InMemoryRateLimiter(requests=10, seconds=1),
)
-app = socketio.ASGIApp(sio, other_asgi_app=base_app)
+# Note: socketio is no longer used for communication. The base FastAPI app is used directly.
+app = base_app
diff --git a/openhands/server/listen_socket.py b/openhands/server/listen_socket.py
deleted file mode 100644
index b00fa1cd2c..0000000000
--- a/openhands/server/listen_socket.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# IMPORTANT: LEGACY V0 CODE - Deprecated since version 1.0.0, scheduled for removal April 1, 2026
-# This file is part of the legacy (V0) implementation of OpenHands and will be removed soon as we complete the migration to V1.
-# OpenHands V1 uses the Software Agent SDK for the agentic core and runs a new application server. Please refer to:
-# - V1 agentic core (SDK): https://github.com/OpenHands/software-agent-sdk
-# - V1 application server (in this repo): openhands/app_server/
-# Unless you are working on deprecation, please avoid extending this legacy file and consult the V1 codepaths above.
-# Tag: Legacy-V0
-# This module belongs to the old V0 web server. The V1 application server lives under openhands/app_server/.
-
-# Re-export sio for backward compatibility with listen.py and enterprise code
-from openhands.server.shared import sio
-
-__all__ = ['sio']
diff --git a/openhands/server/shared.py b/openhands/server/shared.py
index de87d7320b..2a871ac4c9 100644
--- a/openhands/server/shared.py
+++ b/openhands/server/shared.py
@@ -6,9 +6,7 @@
# Unless you are working on deprecation, please avoid extending this legacy file and consult the V1 codepaths above.
# Tag: Legacy-V0
# This module belongs to the old V0 web server. The V1 application server lives under openhands/app_server/.
-import os
-import socketio
from dotenv import load_dotenv
from openhands.app_server.secrets.secrets_store import SecretsStore
@@ -28,22 +26,8 @@ assert isinstance(server_config_interface, ServerConfig), (
)
server_config: ServerConfig = server_config_interface
-client_manager = None
-redis_host = os.environ.get('REDIS_HOST')
-if redis_host:
- client_manager = socketio.AsyncRedisManager(
- f'redis://{redis_host}',
- redis_options={'password': os.environ.get('REDIS_PASSWORD')},
- )
-
-
-sio = socketio.AsyncServer(
- async_mode='asgi',
- cors_allowed_origins='*',
- client_manager=client_manager,
- # Increase buffer size to 4MB (to handle 3MB files with base64 overhead)
- max_http_buffer_size=4 * 1024 * 1024,
-)
+# Note: socketio is no longer used. Redis access should use the standard redis package directly.
+# For enterprise code, use: from enterprise.storage.redis import get_redis_client, get_redis_client_async
SettingsStoreImpl = get_impl(SettingsStore, server_config.settings_store_class)