Merge branch 'main' into mh/rel0230

Author: mamoodi

openhands/server/listen_socket.py

@@ -39,10 +39,10 @@ async def connect(connection_id: str, environ, auth):
     if server_config.app_mode != AppMode.OSS:
         cookies_str = environ.get('HTTP_COOKIE', '')
         cookies = dict(cookie.split('=', 1) for cookie in cookies_str.split('; '))
-        signed_token = cookies.get('github_auth', '')
+        signed_token = cookies.get('openhands_auth', '')
         if not signed_token:
-            logger.error('No github_auth cookie')
-            raise ConnectionRefusedError('No github_auth cookie')
+            logger.error('No openhands_auth cookie')
+            raise ConnectionRefusedError('No openhands_auth cookie')
         if not config.jwt_secret:
             raise RuntimeError('JWT secret not found')
 

openhands/server/routes/github.py

@@ -10,7 +10,6 @@
 
 app = APIRouter(prefix='/api/github')
 
-
 GithubServiceImpl = get_impl(GitHubService, server_config.github_service_class)
 
 

openhands/server/routes/manage_conversations.py

@@ -10,7 +10,8 @@
 from openhands.events.action.message import MessageAction
 from openhands.events.stream import EventStreamSubscriber
 from openhands.runtime import get_runtime_cls
-from openhands.server.auth import get_github_token, get_user_id
+from openhands.server.auth import get_user_id
+from openhands.server.routes.github import GithubServiceImpl
 from openhands.server.session.conversation_init_data import ConversationInitData
 from openhands.server.shared import (
     ConversationStoreImpl,
@@ -130,7 +131,7 @@ async def new_conversation(request: Request, data: InitSessionRequest):
     """
     logger.info('Initializing new conversation')
     user_id = get_user_id(request)
-    github_token = get_github_token(request)
+    github_token = GithubServiceImpl.get_gh_token(request)
     selected_repository = data.selected_repository
     initial_user_msg = data.initial_user_msg
     image_urls = data.image_urls or []

openhands/server/services/github_service.py

@@ -1,7 +1,9 @@
 from typing import Any
 
 import httpx
+from fastapi import Request
 
+from openhands.server.auth import get_github_token
 from openhands.server.data_models.gh_types import GitHubRepository, GitHubUser
 from openhands.server.shared import SettingsStoreImpl, config, server_config
 from openhands.server.types import AppMode, GhAuthenticationError, GHUnknownException
@@ -131,3 +133,7 @@ async def search_repositories(
         ]
 
         return repos
+
+    @classmethod
+    def get_gh_token(cls, request: Request) -> str | None:
+        return get_github_token(request)

poetry.lock

@@ -61,7 +61,7 @@ protobuf = "^4.21.6,<5.0.0" # chromadb currently fails on 5.0+
 opentelemetry-api = "1.25.0"
 opentelemetry-exporter-otlp-proto-grpc = "1.25.0"
 modal = ">=0.66.26,<0.74.0"
-runloop-api-client = "0.18.0"
+runloop-api-client = "0.19.0"
 libtmux = ">=0.37,<0.40"
 pygithub = "^2.5.0"
 joblib = "*"