Skip to content

Commit 275ea70

Browse files
neubigneubig
authored
Remove remaining global config (OpenHands#3099)
* Remove global config from memory * Remove runtime global config * Remove from storage * Remove global config * Fix event stream tests * Fix sandbox issue * Change config * Removed transferred tests * Add swe env box * Fixes on testing * Fixed some tests * Fix typing * Fix ipython test * Revive function * Make temp_dir fixture * Remove test to avoid circular import
1 parent 3301bef commit 275ea70

41 files changed

Lines changed: 279 additions & 306 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎evaluation/EDA/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818

1919
# from evaluation.EDA.scorer import question_scorer
2020
from opendevin.controller.state.state import State
21-
from opendevin.core.config import config, get_llm_config_arg, get_parser
21+
from opendevin.core.config import get_llm_config_arg, get_parser, load_app_config
2222
from opendevin.core.logger import get_console_handler
2323
from opendevin.core.logger import opendevin_logger as logger
2424
from opendevin.core.main import run_agent_controller
2525
from opendevin.llm.llm import LLM
2626

27+
config = load_app_config()
28+
2729
game = None
2830

2931

‎evaluation/agent_bench/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@
2222
)
2323
from opendevin.controller.agent import Agent
2424
from opendevin.controller.state.state import State
25-
from opendevin.core.config import config, get_llm_config_arg, parse_arguments
25+
from opendevin.core.config import get_llm_config_arg, load_app_config, parse_arguments
2626
from opendevin.core.logger import get_console_handler
2727
from opendevin.core.logger import opendevin_logger as logger
2828
from opendevin.core.main import run_agent_controller
2929
from opendevin.events.action import CmdRunAction, MessageAction
3030
from opendevin.llm.llm import LLM
3131
from opendevin.runtime.docker.ssh_box import DockerSSHBox
3232

33+
config = load_app_config()
34+
3335

3436
def process_instance(
3537
instance: pd.Series,

‎evaluation/biocoder/biocoder_env_box.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from datasets import load_dataset
99

10-
from opendevin.core.config import config
10+
from opendevin.core.config import load_app_config
1111
from opendevin.core.logger import opendevin_logger as logger
1212
from opendevin.runtime.docker.ssh_box import DockerSSHBox
1313
from opendevin.runtime.plugins import (
@@ -16,6 +16,8 @@
1616
SWEAgentCommandsRequirement,
1717
)
1818

19+
config = load_app_config()
20+
1921
BIOCODER_BENCH_CONTAINER_IMAGE = 'public.ecr.aws/i5g0m1f6/eval_biocoder:v1.0'
2022

2123

‎evaluation/biocoder/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
)
1919
from opendevin.controller.agent import Agent
2020
from opendevin.controller.state.state import State
21-
from opendevin.core.config import config, get_llm_config_arg, parse_arguments
21+
from opendevin.core.config import get_llm_config_arg, load_app_config, parse_arguments
2222
from opendevin.core.logger import get_console_handler
2323
from opendevin.core.logger import opendevin_logger as logger
2424
from opendevin.core.main import run_agent_controller
2525
from opendevin.llm.llm import LLM
2626

27+
config = load_app_config()
28+
2729
AGENT_CLS_TO_FAKE_USER_RESPONSE_FN = {
2830
'CodeActAgent': partial(
2931
codeact_user_response, encapsulate_solution=True, try_parse=None

‎evaluation/bird/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
)
2222
from opendevin.controller.agent import Agent
2323
from opendevin.controller.state.state import State
24-
from opendevin.core.config import config, get_llm_config_arg, parse_arguments
24+
from opendevin.core.config import get_llm_config_arg, load_app_config, parse_arguments
2525
from opendevin.core.logger import get_console_handler
2626
from opendevin.core.logger import opendevin_logger as logger
2727
from opendevin.core.main import run_agent_controller
2828
from opendevin.events.action import MessageAction
2929
from opendevin.llm.llm import LLM
3030

31+
config = load_app_config()
32+
3133

3234
def codeact_user_response(state: State) -> str:
3335
msg = (

‎evaluation/browsing_delegation/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515
)
1616
from opendevin.controller.agent import Agent
1717
from opendevin.controller.state.state import State
18-
from opendevin.core.config import config, get_llm_config_arg, parse_arguments
18+
from opendevin.core.config import get_llm_config_arg, load_app_config, parse_arguments
1919
from opendevin.core.logger import get_console_handler
2020
from opendevin.core.logger import opendevin_logger as logger
2121
from opendevin.core.main import run_agent_controller
2222
from opendevin.llm.llm import LLM
2323

24+
config = load_app_config()
25+
2426
# Only CodeActAgent can delegate to BrowsingAgent
2527
SUPPORTED_AGENT_CLS = {'CodeActAgent'}
2628

‎evaluation/gaia/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
)
2121
from opendevin.controller.agent import Agent
2222
from opendevin.controller.state.state import State
23-
from opendevin.core.config import config, get_llm_config_arg, get_parser
23+
from opendevin.core.config import get_llm_config_arg, get_parser, load_app_config
2424
from opendevin.core.logger import get_console_handler
2525
from opendevin.core.logger import opendevin_logger as logger
2626
from opendevin.core.main import run_agent_controller
2727
from opendevin.events.action import CmdRunAction, MessageAction
2828
from opendevin.llm.llm import LLM
2929

30+
config = load_app_config()
31+
3032
DATASET_CACHE_DIR = '~/.cache/open-devin/evals/gaia'
3133
DATASET_CACHE_DIR = os.path.expanduser(DATASET_CACHE_DIR)
3234

‎evaluation/gorilla/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from opendevin.controller.agent import Agent
1414
from opendevin.controller.state.state import State
15-
from opendevin.core.config import config, get_llm_config_arg, get_parser
15+
from opendevin.core.config import get_llm_config_arg, get_parser, load_app_config
1616
from opendevin.core.logger import get_console_handler
1717
from opendevin.core.logger import opendevin_logger as logger
1818
from opendevin.core.main import run_agent_controller
@@ -21,6 +21,8 @@
2121

2222
from .utils import encode_question, get_data
2323

24+
config = load_app_config()
25+
2426

2527
def cleanup():
2628
print('Cleaning up child processes...')

‎evaluation/gpqa/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,16 @@
3636
)
3737
from opendevin.controller.agent import Agent
3838
from opendevin.controller.state.state import State
39-
from opendevin.core.config import config, get_llm_config_arg, get_parser
39+
from opendevin.core.config import get_llm_config_arg, get_parser, load_app_config
4040
from opendevin.core.logger import get_console_handler
4141
from opendevin.core.logger import opendevin_logger as logger
4242
from opendevin.core.main import run_agent_controller
4343
from opendevin.events.action import Action, AgentFinishAction, MessageAction
4444
from opendevin.events.observation import Observation
4545
from opendevin.llm.llm import LLM
4646

47+
config = load_app_config()
48+
4749
ACTION_FORMAT = """
4850
<<FINAL_ANSWER||
4951
<insert correct answer here, must be one of A, B, C, D> (Please dont use any additional characters. Just the letter of the correct answer (A/B/C/D).)

‎evaluation/humanevalfix/run_infer.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@
2626
)
2727
from opendevin.controller.agent import Agent
2828
from opendevin.controller.state.state import State
29-
from opendevin.core.config import config, get_llm_config_arg, parse_arguments
29+
from opendevin.core.config import get_llm_config_arg, load_app_config, parse_arguments
3030
from opendevin.core.logger import get_console_handler
3131
from opendevin.core.logger import opendevin_logger as logger
3232
from opendevin.core.main import run_agent_controller
3333
from opendevin.llm.llm import LLM
3434

35+
config = load_app_config()
36+
3537
IMPORT_HELPER = {
3638
'python': [
3739
'import math',

0 commit comments

Comments
 (0)