refactor: fix the dependency in core folder

Author: WannaTen

metagpt/core/base/__init__.py

@@ -1,8 +1,4 @@
 from metagpt.core.base.base_env import BaseEnvironment
-from metagpt.core.base.base_role import BaseRole
 
 
-__all__ = [
-    "BaseEnvironment",
-    "BaseRole",
-]
+__all__ = ["BaseEnvironment"]

metagpt/core/base/base_env.py

@@ -6,8 +6,8 @@
 from abc import abstractmethod
 from typing import Any, Optional
 
-from metagpt.base.base_env_space import BaseEnvAction, BaseEnvObsParams
-from metagpt.base.base_serialization import BaseSerialization
+from metagpt.core.base.base_env_space import BaseEnvAction, BaseEnvObsParams
+from metagpt.core.base.base_serialization import BaseSerialization
 
 if typing.TYPE_CHECKING:
     from metagpt.schema import Message

metagpt/core/config.py

@@ -7,16 +7,12 @@
 """
 import os
 from pathlib import Path
-from typing import Dict, Iterable, List, Literal, Optional
+from typing import Dict, Iterable, Literal
 
-from pydantic import BaseModel, Field, model_validator
+from pydantic import BaseModel, model_validator
 
-from metagpt.configs.embedding_config import EmbeddingConfig
-from metagpt.core.configs.llm_config import LLMConfig, LLMType
-from metagpt.configs.omniparse_config import OmniParseConfig
-from metagpt.configs.role_custom_config import RoleCustomConfig
-from metagpt.configs.workspace_config import WorkspaceConfig
-from metagpt.const import CONFIG_ROOT, METAGPT_ROOT
+from metagpt.core.configs.llm_config import LLMConfig
+from metagpt.core.const import CONFIG_ROOT, METAGPT_ROOT
 from metagpt.core.utils.yaml_model import YamlModel
 
 
@@ -51,7 +47,6 @@ class CoreConfig(CLIParams, YamlModel):
     # Misc Parameters
     repair_llm_output: bool = False
     prompt_schema: Literal["json", "markdown", "raw"] = "json"
-    workspace: WorkspaceConfig = Field(default_factory=WorkspaceConfig)
 
     @classmethod
     def from_home(cls, path):
@@ -113,4 +108,4 @@ def merge_dict(dicts: Iterable[Dict]) -> Dict:
     return result
 
 
-_CONFIG_CACHE = {}
+_CONFIG_CACHE = {}

metagpt/core/configs/llm_config.py

@@ -11,9 +11,9 @@
 
 from pydantic import field_validator
 
-from metagpt.configs.compress_msg_config import CompressType
-from metagpt.const import CONFIG_ROOT, LLM_API_TIMEOUT, METAGPT_ROOT
-from metagpt.utils.yaml_model import YamlModel
+from metagpt.core.configs.compress_msg_config import CompressType
+from metagpt.core.const import CONFIG_ROOT, LLM_API_TIMEOUT, METAGPT_ROOT
+from metagpt.core.utils.yaml_model import YamlModel
 
 
 class LLMType(Enum):

metagpt/core/configs/models_config.py

@@ -19,7 +19,7 @@
 
 from metagpt.core.config import merge_dict
 from metagpt.core.configs.llm_config import LLMConfig
-from metagpt.const import CONFIG_ROOT, METAGPT_ROOT
+from metagpt.core.const import CONFIG_ROOT, METAGPT_ROOT
 from metagpt.core.utils.yaml_model import YamlModel
 
 

metagpt/core/const.py

@@ -38,40 +38,8 @@ def get_metagpt_root():
 # METAGPT PROJECT ROOT AND VARS
 CONFIG_ROOT = Path.home() / ".metagpt"
 METAGPT_ROOT = get_metagpt_root()  # Dependent on METAGPT_PROJECT_ROOT
-DEFAULT_WORKSPACE_ROOT = METAGPT_ROOT / "workspace"
-
-EXAMPLE_PATH = METAGPT_ROOT / "examples"
-EXAMPLE_DATA_PATH = EXAMPLE_PATH / "data"
-DATA_PATH = METAGPT_ROOT / "data"
-DABENCH_PATH = EXAMPLE_PATH / "di/InfiAgent-DABench/data"
-EXAMPLE_BENCHMARK_PATH = EXAMPLE_PATH / "data/rag_bm"
-TEST_DATA_PATH = METAGPT_ROOT / "tests/data"
-RESEARCH_PATH = DATA_PATH / "research"
-TUTORIAL_PATH = DATA_PATH / "tutorial_docx"
-INVOICE_OCR_TABLE_PATH = DATA_PATH / "invoice_table"
-
-UT_PATH = DATA_PATH / "ut"
-SWAGGER_PATH = UT_PATH / "files/api/"
-UT_PY_PATH = UT_PATH / "files/ut/"
-API_QUESTIONS_PATH = UT_PATH / "files/question/"
-
-SERDESER_PATH = DEFAULT_WORKSPACE_ROOT / "storage"  # TODO to store `storage` under the individual generated project
-
-TMP = METAGPT_ROOT / "tmp"
-
-SOURCE_ROOT = METAGPT_ROOT / "metagpt"
-PROMPT_PATH = SOURCE_ROOT / "prompts"
-SKILL_DIRECTORY = SOURCE_ROOT / "skills"
-TOOL_SCHEMA_PATH = METAGPT_ROOT / "metagpt/tools/schemas"
-TOOL_LIBS_PATH = METAGPT_ROOT / "metagpt/tools/libs"
-
-# TEMPLATE PATH
-TEMPLATE_FOLDER_PATH = METAGPT_ROOT / "template"
-VUE_TEMPLATE_PATH = TEMPLATE_FOLDER_PATH / "vue_template"
-REACT_TEMPLATE_PATH = TEMPLATE_FOLDER_PATH / "react_template"
 
 # REAL CONSTS
-
 MEM_TTL = 24 * 30 * 3600
 
 MESSAGE_ROUTE_FROM = "sent_from"
@@ -82,49 +50,17 @@ def get_metagpt_root():
 MESSAGE_ROUTE_TO_NONE = "<none>"
 MESSAGE_ROUTE_TO_SELF = "<self>"  # Add this tag to replace `ActionOutput`
 
-
-REQUIREMENT_FILENAME = "requirement.txt"
+CORE_REQUIREMENT_FILENAME = "requirement_core.txt"
 BUGFIX_FILENAME = "bugfix.txt"
-PACKAGE_REQUIREMENTS_FILENAME = "requirements.txt"
-
-DOCS_FILE_REPO = "docs"
-PRDS_FILE_REPO = "docs/prd"
-SYSTEM_DESIGN_FILE_REPO = "docs/system_design"
-TASK_FILE_REPO = "docs/task"
-CODE_PLAN_AND_CHANGE_FILE_REPO = "docs/code_plan_and_change"
-COMPETITIVE_ANALYSIS_FILE_REPO = "resources/competitive_analysis"
-DATA_API_DESIGN_FILE_REPO = "resources/data_api_design"
-SEQ_FLOW_FILE_REPO = "resources/seq_flow"
-SYSTEM_DESIGN_PDF_FILE_REPO = "resources/system_design"
-PRD_PDF_FILE_REPO = "resources/prd"
-TASK_PDF_FILE_REPO = "resources/api_spec_and_task"
-CODE_PLAN_AND_CHANGE_PDF_FILE_REPO = "resources/code_plan_and_change"
-TEST_CODES_FILE_REPO = "tests"
-TEST_OUTPUTS_FILE_REPO = "test_outputs"
-CODE_SUMMARIES_FILE_REPO = "docs/code_summary"
-CODE_SUMMARIES_PDF_FILE_REPO = "resources/code_summary"
-RESOURCES_FILE_REPO = "resources"
-SD_OUTPUT_FILE_REPO = DEFAULT_WORKSPACE_ROOT
-GRAPH_REPO_FILE_REPO = "docs/graph_repo"
-VISUAL_GRAPH_REPO_FILE_REPO = "resources/graph_db"
-CLASS_VIEW_FILE_REPO = "docs/class_view"
-
-YAPI_URL = "http://yapi.deepwisdomai.com/"
-SD_URL = "http://172.31.0.51:49094"
 
 DEFAULT_LANGUAGE = "English"
 DEFAULT_MAX_TOKENS = 1500
 COMMAND_TOKENS = 500
-SKILL_PATH = "SKILL_PATH"
-SERPER_API_KEY = "SERPER_API_KEY"
 DEFAULT_TOKEN_SIZE = 500
 
 # format
 BASE64_FORMAT = "base64"
 
-# REDIS
-REDIS_KEY = "REDIS_KEY"
-
 # Message id
 IGNORED_MESSAGE_ID = "0"
 
@@ -150,12 +86,5 @@ def get_metagpt_root():
 AGENT = "agent"
 IMAGES = "images"
 
-
-# experience pool
-EXPERIENCE_MASK = "<experience>"
-
-# TeamLeader's name
-TEAMLEADER_NAME = "Mike"
-
 DEFAULT_MIN_TOKEN_COUNT = 10000
 DEFAULT_MAX_TOKEN_COUNT = 100000000

metagpt/core/context.py

@@ -12,11 +12,11 @@
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from metagpt.config2 import Config
-from metagpt.configs.llm_config import LLMConfig, LLMType
-from metagpt.provider.base_llm import BaseLLM
-from metagpt.provider.llm_provider_registry import create_llm_instance
-from metagpt.utils.cost_manager import (
+from metagpt.core.config import CoreConfig
+from metagpt.core.configs.llm_config import LLMConfig, LLMType
+from metagpt.core.provider.base_llm import BaseLLM
+from metagpt.core.provider.llm_provider_registry import create_llm_instance
+from metagpt.core.utils.cost_manager import (
     CostManager,
     FireworksCostManager,
     TokenCostManager,
@@ -61,7 +61,7 @@ class Context(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     kwargs: AttrDict = AttrDict()
-    config: Config = Field(default_factory=Config.default)
+    config: CoreConfig = Field(default_factory=CoreConfig.default)
 
     cost_manager: CostManager = CostManager()