diff --git a/metagpt/environment/android/env_space.py b/metagpt/environment/android/env_space.py index 9580e3a7d..8225f0127 100644 --- a/metagpt/environment/android/env_space.py +++ b/metagpt/environment/android/env_space.py @@ -10,7 +10,7 @@ import numpy.typing as npt from gymnasium import spaces from pydantic import ConfigDict, Field, field_validator -from metagpt.environment.base_env_space import ( +from metagpt.base.base_env_space import ( BaseEnvAction, BaseEnvActionType, BaseEnvObsParams, diff --git a/metagpt/environment/werewolf/env_space.py b/metagpt/environment/werewolf/env_space.py index e6243b10f..dd6ceeabe 100644 --- a/metagpt/environment/werewolf/env_space.py +++ b/metagpt/environment/werewolf/env_space.py @@ -5,7 +5,7 @@ from gymnasium import spaces from pydantic import ConfigDict, Field -from metagpt.environment.base_env_space import BaseEnvAction, BaseEnvActionType +from metagpt.base.base_env_space import BaseEnvAction, BaseEnvActionType from metagpt.environment.werewolf.const import STEP_INSTRUCTIONS diff --git a/metagpt/ext/android_assistant/actions/manual_record.py b/metagpt/ext/android_assistant/actions/manual_record.py index bcfb2ed89..71e4d5e82 100644 --- a/metagpt/ext/android_assistant/actions/manual_record.py +++ b/metagpt/ext/android_assistant/actions/manual_record.py @@ -7,7 +7,7 @@ from pathlib import Path import cv2 from metagpt.actions.action import Action -from metagpt.config2 import config +from metagpt.config2 import Config from metagpt.environment.android.android_env import AndroidEnv from metagpt.environment.android.const import ADB_EXEC_FAIL from metagpt.environment.android.env_space import ( @@ -55,6 +55,7 @@ class ManualRecord(Action): self.task_desc_path.write_text(task_desc) step = 0 + config = Config.default() extra_config = config.extra while True: step += 1 diff --git a/metagpt/ext/android_assistant/actions/parse_record.py b/metagpt/ext/android_assistant/actions/parse_record.py index 304daf655..f96ad0a19 100644 --- a/metagpt/ext/android_assistant/actions/parse_record.py +++ b/metagpt/ext/android_assistant/actions/parse_record.py @@ -8,7 +8,7 @@ import re from pathlib import Path from metagpt.actions.action import Action -from metagpt.config2 import config +from metagpt.config2 import Config from metagpt.ext.android_assistant.actions.parse_record_an import RECORD_PARSE_NODE from metagpt.ext.android_assistant.prompts.operation_prompt import ( long_press_doc_template, @@ -45,6 +45,7 @@ class ParseRecord(Action): path.mkdir(parents=True, exist_ok=True) task_desc = self.task_desc_path.read_text() + config = Config.default() extra_config = config.extra with open(self.record_path, "r") as record_file: diff --git a/metagpt/ext/android_assistant/actions/screenshot_parse.py b/metagpt/ext/android_assistant/actions/screenshot_parse.py index 4d8bb0e1e..8cb738522 100644 --- a/metagpt/ext/android_assistant/actions/screenshot_parse.py +++ b/metagpt/ext/android_assistant/actions/screenshot_parse.py @@ -6,7 +6,7 @@ import ast from pathlib import Path from metagpt.actions.action import Action -from metagpt.config2 import config +from metagpt.config2 import Config from metagpt.environment.android.android_env import AndroidEnv from metagpt.environment.android.const import ADB_EXEC_FAIL from metagpt.environment.android.env_space import ( @@ -101,6 +101,7 @@ next action. You should always prioritize these documented elements for interact grid_on: bool, env: AndroidEnv, ): + config = Config.default() extra_config = config.extra for path in [task_dir, docs_dir]: path.mkdir(parents=True, exist_ok=True) diff --git a/metagpt/ext/android_assistant/actions/self_learn_and_reflect.py b/metagpt/ext/android_assistant/actions/self_learn_and_reflect.py index 5e9cfbb45..b783217ff 100644 --- a/metagpt/ext/android_assistant/actions/self_learn_and_reflect.py +++ b/metagpt/ext/android_assistant/actions/self_learn_and_reflect.py @@ -6,7 +6,7 @@ import ast from pathlib import Path from metagpt.actions.action import Action -from metagpt.config2 import config +from metagpt.config2 import Config from metagpt.environment.android.android_env import AndroidEnv from metagpt.environment.android.const import ADB_EXEC_FAIL from metagpt.environment.android.env_space import ( @@ -80,6 +80,7 @@ class SelfLearnAndReflect(Action): async def run_self_learn( self, round_count: int, task_desc: str, last_act: str, task_dir: Path, env: AndroidEnv ) -> AndroidActionOutput: + config = Config.default() extra_config = config.extra screenshot_path: Path = env.observe( EnvObsParams(obs_type=EnvObsType.GET_SCREENSHOT, ss_name=f"{round_count}_before", local_save_dir=task_dir) diff --git a/metagpt/ext/android_assistant/roles/android_assistant.py b/metagpt/ext/android_assistant/roles/android_assistant.py index 45636f519..6462e30a2 100644 --- a/metagpt/ext/android_assistant/roles/android_assistant.py +++ b/metagpt/ext/android_assistant/roles/android_assistant.py @@ -9,7 +9,7 @@ from typing import Optional from pydantic import Field from metagpt.actions.add_requirement import UserRequirement -from metagpt.config2 import config +from metagpt.config2 import Config from metagpt.const import EXAMPLE_PATH from metagpt.ext.android_assistant.actions.manual_record import ManualRecord from metagpt.ext.android_assistant.actions.parse_record import ParseRecord @@ -38,7 +38,7 @@ class AndroidAssistant(Role): def __init__(self, **data): super().__init__(**data) - + config = Config.default() self._watch([UserRequirement, AndroidActionOutput]) extra_config = config.extra self.task_desc = extra_config.get("task_desc", "Just explore any app in this phone!") diff --git a/metagpt/ext/android_assistant/utils/utils.py b/metagpt/ext/android_assistant/utils/utils.py index f1fa13869..168369054 100644 --- a/metagpt/ext/android_assistant/utils/utils.py +++ b/metagpt/ext/android_assistant/utils/utils.py @@ -10,7 +10,7 @@ from xml.etree.ElementTree import Element, iterparse import cv2 import pyshine as ps -from metagpt.config2 import config +from metagpt.config2 import Config from metagpt.ext.android_assistant.utils.schema import ( ActionOp, AndroidElement, @@ -48,6 +48,7 @@ def get_id_from_element(elem: Element) -> str: def traverse_xml_tree(xml_path: Path, elem_list: list[AndroidElement], attrib: str, add_index=False): path = [] + config = Config.default() extra_config = config.extra for event, elem in iterparse(str(xml_path), ["start", "end"]): if event == "start": diff --git a/metagpt/rag/engines/simple.py b/metagpt/rag/engines/simple.py index 61200a295..1c0834c96 100644 --- a/metagpt/rag/engines/simple.py +++ b/metagpt/rag/engines/simple.py @@ -31,7 +31,7 @@ from llama_index.core.schema import ( TransformComponent, ) -from metagpt.config2 import config +from metagpt.config2 import Config from metagpt.rag.factories import ( get_index, get_rag_embedding, @@ -400,6 +400,7 @@ class SimpleEngine(RetrieverQueryEngine): dict[file_type: BaseReader] """ file_extractor: dict[str:BaseReader] = {} + config = Config.default() if config.omniparse.base_url: pdf_parser = OmniParse( api_key=config.omniparse.api_key, diff --git a/setup.py b/setup.py index 2ffc09ee8..658c82219 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ extras_require = { "llama-index-postprocessor-cohere-rerank==0.1.4", "llama-index-postprocessor-colbert-rerank==0.1.1", "llama-index-postprocessor-flag-embedding-reranker==0.1.2", - # "llama-index-vector-stores-milvus==0.1.23", + "llama-index-vector-stores-milvus==0.1.23", "docx2txt==0.8", ], }