github/OpenHands
1
0
Fork 0
mirror of https://github.com/OpenHands/OpenHands.git synced 2025-12-26 05:48:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix CLI runtime not disabling jupyter plugin by default (#9452)

Browse Source
This commit is contained in:
Boxuan Li 2025-06-29 17:04:16 -07:00 committed by GitHub
parent 34bf645d64
commit c992b6d2a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openhands/cli/main.py
View File

@ -41,6 +41,7 @@ from openhands.core.config import (
) )
from openhands.core.config.condenser_config import NoOpCondenserConfig from openhands.core.config.condenser_config import NoOpCondenserConfig
from openhands.core.config.mcp_config import OpenHandsMCPConfigImpl from openhands.core.config.mcp_config import OpenHandsMCPConfigImpl
from openhands.core.config.utils import finalize_config
from openhands.core.logger import openhands_logger as logger from openhands.core.logger import openhands_logger as logger
from openhands.core.loop import run_agent_until_done from openhands.core.loop import run_agent_until_done
from openhands.core.schema import AgentState from openhands.core.schema import AgentState
@ -433,6 +434,10 @@ async def main_with_loop(loop: asyncio.AbstractEventLoop) -> None:
config.workspace_base = os.getcwd() config.workspace_base = os.getcwd()
config.security.confirmation_mode = True config.security.confirmation_mode = True
# Need to finalize config again after setting runtime to 'cli'
# This ensures Jupyter plugin is disabled for CLI runtime
finalize_config(config)
# TODO: Set working directory from config or use current working directory? # TODO: Set working directory from config or use current working directory?
current_dir = config.workspace_base current_dir = config.workspace_base

26
tests/unit/test_cli.py
View File

@ -125,6 +125,12 @@ def mock_config():
) )
config.search_api_key = search_api_key_mock config.search_api_key = search_api_key_mock
# Mock sandbox with volumes attribute to prevent finalize_config issues
config.sandbox = MagicMock()
config.sandbox.volumes = (
None # This prevents finalize_config from overriding workspace_base
)
return config return config
@ -327,7 +333,9 @@ async def test_run_session_with_initial_action(
@patch('openhands.cli.main.run_session') @patch('openhands.cli.main.run_session')
@patch('openhands.cli.main.LLMSummarizingCondenserConfig') @patch('openhands.cli.main.LLMSummarizingCondenserConfig')
@patch('openhands.cli.main.NoOpCondenserConfig') @patch('openhands.cli.main.NoOpCondenserConfig')
@patch('openhands.cli.main.finalize_config')
async def test_main_without_task( async def test_main_without_task(
mock_finalize_config,
mock_noop_condenser, mock_noop_condenser,
mock_llm_condenser, mock_llm_condenser,
mock_run_session, mock_run_session,
@ -411,7 +419,9 @@ async def test_main_without_task(
@patch('openhands.cli.main.run_session') @patch('openhands.cli.main.run_session')
@patch('openhands.cli.main.LLMSummarizingCondenserConfig') @patch('openhands.cli.main.LLMSummarizingCondenserConfig')
@patch('openhands.cli.main.NoOpCondenserConfig') @patch('openhands.cli.main.NoOpCondenserConfig')
@patch('openhands.cli.main.finalize_config')
async def test_main_with_task( async def test_main_with_task(
mock_finalize_config,
mock_noop_condenser, mock_noop_condenser,
mock_llm_condenser, mock_llm_condenser,
mock_run_session, mock_run_session,
@ -506,7 +516,9 @@ async def test_main_with_task(
@patch('openhands.cli.main.run_session') @patch('openhands.cli.main.run_session')
@patch('openhands.cli.main.LLMSummarizingCondenserConfig') @patch('openhands.cli.main.LLMSummarizingCondenserConfig')
@patch('openhands.cli.main.NoOpCondenserConfig') @patch('openhands.cli.main.NoOpCondenserConfig')
@patch('openhands.cli.main.finalize_config')
async def test_main_with_session_name_passes_name_to_run_session( async def test_main_with_session_name_passes_name_to_run_session(
mock_finalize_config,
mock_noop_condenser, mock_noop_condenser,
mock_llm_condenser, mock_llm_condenser,
mock_run_session, mock_run_session,
@ -600,7 +612,9 @@ async def test_main_with_session_name_passes_name_to_run_session(
@patch('openhands.cli.main.display_initialization_animation') # Cosmetic @patch('openhands.cli.main.display_initialization_animation') # Cosmetic
@patch('openhands.cli.main.initialize_repository_for_runtime') # Cosmetic / setup @patch('openhands.cli.main.initialize_repository_for_runtime') # Cosmetic / setup
@patch('openhands.cli.main.display_initial_user_prompt') # Cosmetic @patch('openhands.cli.main.display_initial_user_prompt') # Cosmetic
@patch('openhands.cli.main.finalize_config')
async def test_run_session_with_name_attempts_state_restore( async def test_run_session_with_name_attempts_state_restore(
mock_finalize_config,
mock_display_initial_user_prompt, mock_display_initial_user_prompt,
mock_initialize_repo, mock_initialize_repo,
mock_display_init_anim, mock_display_init_anim,
@ -684,11 +698,17 @@ async def test_run_session_with_name_attempts_state_restore(
@patch('openhands.cli.main.setup_config_from_args') @patch('openhands.cli.main.setup_config_from_args')
@patch('openhands.cli.main.FileSettingsStore.get_instance') @patch('openhands.cli.main.FileSettingsStore.get_instance')
@patch('openhands.cli.main.check_folder_security_agreement') @patch('openhands.cli.main.check_folder_security_agreement')
@patch('openhands.cli.main.read_task')
@patch('openhands.cli.main.run_session')
@patch('openhands.cli.main.LLMSummarizingCondenserConfig') @patch('openhands.cli.main.LLMSummarizingCondenserConfig')
@patch('openhands.cli.main.NoOpCondenserConfig') @patch('openhands.cli.main.NoOpCondenserConfig')
@patch('openhands.cli.main.finalize_config')
async def test_main_security_check_fails( async def test_main_security_check_fails(
mock_finalize_config,
mock_noop_condenser, mock_noop_condenser,
mock_llm_condenser, mock_llm_condenser,
mock_run_session,
mock_read_task,
mock_check_security, mock_check_security,
mock_get_settings_store, mock_get_settings_store,
mock_setup_config, mock_setup_config,
@ -743,7 +763,9 @@ async def test_main_security_check_fails(
@patch('openhands.cli.main.run_session') @patch('openhands.cli.main.run_session')
@patch('openhands.cli.main.LLMSummarizingCondenserConfig') @patch('openhands.cli.main.LLMSummarizingCondenserConfig')
@patch('openhands.cli.main.NoOpCondenserConfig') @patch('openhands.cli.main.NoOpCondenserConfig')
@patch('openhands.cli.main.finalize_config')
async def test_config_loading_order( async def test_config_loading_order(
mock_finalize_config,
mock_noop_condenser, mock_noop_condenser,
mock_llm_condenser, mock_llm_condenser,
mock_run_session, mock_run_session,
@ -841,15 +863,19 @@ async def test_config_loading_order(
@patch('openhands.cli.main.setup_config_from_args') @patch('openhands.cli.main.setup_config_from_args')
@patch('openhands.cli.main.FileSettingsStore.get_instance') @patch('openhands.cli.main.FileSettingsStore.get_instance')
@patch('openhands.cli.main.check_folder_security_agreement') @patch('openhands.cli.main.check_folder_security_agreement')
@patch('openhands.cli.main.read_task')
@patch('openhands.cli.main.run_session') @patch('openhands.cli.main.run_session')
@patch('openhands.cli.main.LLMSummarizingCondenserConfig') @patch('openhands.cli.main.LLMSummarizingCondenserConfig')
@patch('openhands.cli.main.NoOpCondenserConfig') @patch('openhands.cli.main.NoOpCondenserConfig')
@patch('openhands.cli.main.finalize_config')
@patch('builtins.open', new_callable=MagicMock) @patch('builtins.open', new_callable=MagicMock)
async def test_main_with_file_option( async def test_main_with_file_option(
mock_open, mock_open,
mock_finalize_config,
mock_noop_condenser, mock_noop_condenser,
mock_llm_condenser, mock_llm_condenser,
mock_run_session, mock_run_session,
mock_read_task,
mock_check_security, mock_check_security,
mock_get_settings_store, mock_get_settings_store,
mock_setup_config, mock_setup_config,