diff --git a/metagpt/actions/__init__.py b/metagpt/actions/__init__.py index 3f88fbcf3..6c0a2addc 100644 --- a/metagpt/actions/__init__.py +++ b/metagpt/actions/__init__.py @@ -22,9 +22,9 @@ from metagpt.actions.write_code_review import WriteCodeReview from metagpt.actions.write_prd import WritePRD from metagpt.actions.write_prd_review import WritePRDReview from metagpt.actions.write_test import WriteTest -from metagpt.actions.execute_nb_code import ExecuteNbCode -from metagpt.actions.write_analysis_code import WriteCodeByGenerate -from metagpt.actions.write_plan import WritePlan +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode +from metagpt.actions.ci.write_analysis_code import WriteCodeByGenerate +from metagpt.actions.ci.write_plan import WritePlan class ActionType(Enum): diff --git a/metagpt/actions/ask_review.py b/metagpt/actions/ci/ask_review.py similarity index 100% rename from metagpt/actions/ask_review.py rename to metagpt/actions/ci/ask_review.py diff --git a/metagpt/actions/debug_code.py b/metagpt/actions/ci/debug_code.py similarity index 97% rename from metagpt/actions/debug_code.py rename to metagpt/actions/ci/debug_code.py index 34dac0147..f6b86b8bf 100644 --- a/metagpt/actions/debug_code.py +++ b/metagpt/actions/ci/debug_code.py @@ -1,6 +1,6 @@ from typing import List -from metagpt.actions.write_analysis_code import BaseWriteAnalysisCode +from metagpt.actions.ci.write_analysis_code import BaseWriteAnalysisCode from metagpt.logs import logger from metagpt.schema import Message from metagpt.utils.common import create_func_call_config diff --git a/metagpt/actions/execute_nb_code.py b/metagpt/actions/ci/execute_nb_code.py similarity index 100% rename from metagpt/actions/execute_nb_code.py rename to metagpt/actions/ci/execute_nb_code.py diff --git a/metagpt/actions/ml_action.py b/metagpt/actions/ci/ml_action.py similarity index 93% rename from metagpt/actions/ml_action.py rename to metagpt/actions/ci/ml_action.py index 88476707c..6fecae898 100644 --- a/metagpt/actions/ml_action.py +++ b/metagpt/actions/ci/ml_action.py @@ -1,14 +1,14 @@ from typing import List, Tuple from metagpt.actions import Action -from metagpt.actions.write_analysis_code import WriteCodeWithTools -from metagpt.prompts.ml_action import ( +from metagpt.actions.ci.write_analysis_code import WriteCodeWithTools +from metagpt.prompts.ci.ml_action import ( GENERATE_CODE_PROMPT, ML_TOOL_USAGE_PROMPT, PRINT_DATA_COLUMNS, UPDATE_DATA_COLUMNS, ) -from metagpt.prompts.write_analysis_code import CODE_GENERATOR_WITH_TOOLS +from metagpt.prompts.ci.write_analysis_code import CODE_GENERATOR_WITH_TOOLS from metagpt.schema import Message, Plan from metagpt.utils.common import create_func_call_config, remove_comments diff --git a/metagpt/actions/write_analysis_code.py b/metagpt/actions/ci/write_analysis_code.py similarity index 99% rename from metagpt/actions/write_analysis_code.py rename to metagpt/actions/ci/write_analysis_code.py index c4ac44f20..4e4ea7953 100644 --- a/metagpt/actions/write_analysis_code.py +++ b/metagpt/actions/ci/write_analysis_code.py @@ -8,7 +8,7 @@ from typing import Tuple from metagpt.actions import Action from metagpt.logs import logger -from metagpt.prompts.write_analysis_code import ( +from metagpt.prompts.ci.write_analysis_code import ( CODE_GENERATOR_WITH_TOOLS, SELECT_FUNCTION_TOOLS, TOOL_RECOMMENDATION_PROMPT, diff --git a/metagpt/actions/write_plan.py b/metagpt/actions/ci/write_plan.py similarity index 98% rename from metagpt/actions/write_plan.py rename to metagpt/actions/ci/write_plan.py index 77b52b78e..885611c68 100644 --- a/metagpt/actions/write_plan.py +++ b/metagpt/actions/ci/write_plan.py @@ -10,7 +10,7 @@ from typing import Dict, List, Tuple from metagpt.actions import Action from metagpt.logs import logger -from metagpt.prompts.write_analysis_code import ( +from metagpt.prompts.ci.write_analysis_code import ( ASSIGN_TASK_TYPE_CONFIG, ASSIGN_TASK_TYPE_PROMPT, ) diff --git a/metagpt/plan/planner.py b/metagpt/plan/planner.py index 0b3a05199..1b3971b7d 100644 --- a/metagpt/plan/planner.py +++ b/metagpt/plan/planner.py @@ -2,8 +2,8 @@ import json from pydantic import BaseModel, Field -from metagpt.actions.ask_review import AskReview, ReviewConst -from metagpt.actions.write_plan import ( +from metagpt.actions.ci.ask_review import AskReview, ReviewConst +from metagpt.actions.ci.write_plan import ( WritePlan, precheck_update_plan_from_rsp, update_plan_from_rsp, diff --git a/metagpt/prompts/ml_action.py b/metagpt/prompts/ci/ml_action.py similarity index 100% rename from metagpt/prompts/ml_action.py rename to metagpt/prompts/ci/ml_action.py diff --git a/metagpt/prompts/write_analysis_code.py b/metagpt/prompts/ci/write_analysis_code.py similarity index 100% rename from metagpt/prompts/write_analysis_code.py rename to metagpt/prompts/ci/write_analysis_code.py diff --git a/metagpt/roles/code_interpreter.py b/metagpt/roles/code_interpreter.py index 1cae17ca0..f8d00bb91 100644 --- a/metagpt/roles/code_interpreter.py +++ b/metagpt/roles/code_interpreter.py @@ -1,8 +1,11 @@ from pydantic import Field -from metagpt.actions.ask_review import ReviewConst -from metagpt.actions.execute_nb_code import ExecuteNbCode -from metagpt.actions.write_analysis_code import WriteCodeByGenerate, WriteCodeWithTools +from metagpt.actions.ci.ask_review import ReviewConst +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode +from metagpt.actions.ci.write_analysis_code import ( + WriteCodeByGenerate, + WriteCodeWithTools, +) from metagpt.logs import logger from metagpt.roles import Role from metagpt.schema import Message, Task, TaskResult diff --git a/metagpt/roles/ml_engineer.py b/metagpt/roles/ml_engineer.py index 9d222b0bf..c7702771d 100644 --- a/metagpt/roles/ml_engineer.py +++ b/metagpt/roles/ml_engineer.py @@ -1,6 +1,6 @@ -from metagpt.actions.debug_code import DebugCode -from metagpt.actions.execute_nb_code import ExecuteNbCode -from metagpt.actions.ml_action import UpdateDataColumns, WriteCodeWithToolsML +from metagpt.actions.ci.debug_code import DebugCode +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode +from metagpt.actions.ci.ml_action import UpdateDataColumns, WriteCodeWithToolsML from metagpt.logs import logger from metagpt.roles.code_interpreter import CodeInterpreter from metagpt.tools.tool_types import ToolTypes diff --git a/tests/metagpt/actions/test_ask_review.py b/tests/metagpt/actions/ci/test_ask_review.py similarity index 84% rename from tests/metagpt/actions/test_ask_review.py rename to tests/metagpt/actions/ci/test_ask_review.py index 00001fad6..4f02fe10b 100644 --- a/tests/metagpt/actions/test_ask_review.py +++ b/tests/metagpt/actions/ci/test_ask_review.py @@ -1,6 +1,6 @@ import pytest -from metagpt.actions.ask_review import AskReview +from metagpt.actions.ci.ask_review import AskReview @pytest.mark.asyncio diff --git a/tests/metagpt/actions/test_debug_code.py b/tests/metagpt/actions/ci/test_debug_code.py similarity index 96% rename from tests/metagpt/actions/test_debug_code.py rename to tests/metagpt/actions/ci/test_debug_code.py index 32a4914f4..0307ac17e 100644 --- a/tests/metagpt/actions/test_debug_code.py +++ b/tests/metagpt/actions/ci/test_debug_code.py @@ -5,7 +5,7 @@ import pytest -from metagpt.actions.debug_code import DebugCode +from metagpt.actions.ci.debug_code import DebugCode from metagpt.schema import Message ErrorStr = """Tested passed: diff --git a/tests/metagpt/actions/test_execute_nb_code.py b/tests/metagpt/actions/ci/test_execute_nb_code.py similarity index 97% rename from tests/metagpt/actions/test_execute_nb_code.py rename to tests/metagpt/actions/ci/test_execute_nb_code.py index d1b40c350..6402cb883 100644 --- a/tests/metagpt/actions/test_execute_nb_code.py +++ b/tests/metagpt/actions/ci/test_execute_nb_code.py @@ -1,6 +1,6 @@ import pytest -from metagpt.actions.execute_nb_code import ExecuteNbCode, truncate +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode, truncate @pytest.mark.asyncio diff --git a/tests/metagpt/actions/test_ml_action.py b/tests/metagpt/actions/ci/test_ml_action.py similarity index 95% rename from tests/metagpt/actions/test_ml_action.py rename to tests/metagpt/actions/ci/test_ml_action.py index 2c8d34da8..5d9507094 100644 --- a/tests/metagpt/actions/test_ml_action.py +++ b/tests/metagpt/actions/ci/test_ml_action.py @@ -1,6 +1,6 @@ import pytest -from metagpt.actions.ml_action import WriteCodeWithToolsML +from metagpt.actions.ci.ml_action import WriteCodeWithToolsML from metagpt.schema import Plan, Task diff --git a/tests/metagpt/actions/test_write_analysis_code.py b/tests/metagpt/actions/ci/test_write_analysis_code.py similarity index 98% rename from tests/metagpt/actions/test_write_analysis_code.py rename to tests/metagpt/actions/ci/test_write_analysis_code.py index eec3d3e38..72071fa35 100644 --- a/tests/metagpt/actions/test_write_analysis_code.py +++ b/tests/metagpt/actions/ci/test_write_analysis_code.py @@ -2,8 +2,11 @@ import asyncio import pytest -from metagpt.actions.execute_nb_code import ExecuteNbCode -from metagpt.actions.write_analysis_code import WriteCodeByGenerate, WriteCodeWithTools +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode +from metagpt.actions.ci.write_analysis_code import ( + WriteCodeByGenerate, + WriteCodeWithTools, +) from metagpt.logs import logger from metagpt.plan.planner import STRUCTURAL_CONTEXT from metagpt.schema import Message, Plan, Task diff --git a/tests/metagpt/actions/test_write_plan.py b/tests/metagpt/actions/ci/test_write_plan.py similarity index 95% rename from tests/metagpt/actions/test_write_plan.py rename to tests/metagpt/actions/ci/test_write_plan.py index f36527711..3eb80ca3e 100644 --- a/tests/metagpt/actions/test_write_plan.py +++ b/tests/metagpt/actions/ci/test_write_plan.py @@ -1,6 +1,6 @@ import pytest -from metagpt.actions.write_plan import ( +from metagpt.actions.ci.write_plan import ( Plan, Task, WritePlan, diff --git a/tests/metagpt/roles/run_code_interpreter.py b/tests/metagpt/roles/run_code_interpreter.py index e5e2b8df5..f0fcdb200 100644 --- a/tests/metagpt/roles/run_code_interpreter.py +++ b/tests/metagpt/roles/run_code_interpreter.py @@ -1,6 +1,6 @@ import fire -from metagpt.actions.execute_nb_code import ExecuteNbCode +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode from metagpt.const import DATA_PATH from metagpt.logs import logger from metagpt.roles.code_interpreter import CodeInterpreter diff --git a/tests/metagpt/roles/test_code_interpreter.py b/tests/metagpt/roles/test_code_interpreter.py index 2263b2a4a..2d71fcbb0 100644 --- a/tests/metagpt/roles/test_code_interpreter.py +++ b/tests/metagpt/roles/test_code_interpreter.py @@ -7,7 +7,7 @@ from metagpt.roles.code_interpreter import CodeInterpreter @pytest.mark.asyncio @pytest.mark.parametrize("auto_run", [(True), (False)]) async def test_code_interpreter(mocker, auto_run): - mocker.patch("metagpt.actions.execute_nb_code.ExecuteNbCode.run", return_value=("a successful run", True)) + mocker.patch("metagpt.actions.ci.execute_nb_code.ExecuteNbCode.run", return_value=("a successful run", True)) mocker.patch("builtins.input", return_value="confirm") requirement = "Run data analysis on sklearn Iris dataset, include a plot" diff --git a/tests/metagpt/roles/test_ml_engineer.py b/tests/metagpt/roles/test_ml_engineer.py index c00481019..2728c6411 100644 --- a/tests/metagpt/roles/test_ml_engineer.py +++ b/tests/metagpt/roles/test_ml_engineer.py @@ -1,11 +1,11 @@ import pytest -from metagpt.actions.execute_nb_code import ExecuteNbCode +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode from metagpt.logs import logger from metagpt.roles.ml_engineer import MLEngineer from metagpt.schema import Message, Plan, Task from metagpt.tools.tool_types import ToolTypes -from tests.metagpt.actions.test_debug_code import CODE, DebugContext, ErrorStr +from tests.metagpt.actions.ci.test_debug_code import CODE, DebugContext, ErrorStr def test_mle_init(): diff --git a/tests/metagpt/utils/test_save_code.py b/tests/metagpt/utils/test_save_code.py index 62724dde5..5ab08c454 100644 --- a/tests/metagpt/utils/test_save_code.py +++ b/tests/metagpt/utils/test_save_code.py @@ -6,7 +6,7 @@ import nbformat import pytest -from metagpt.actions.execute_nb_code import ExecuteNbCode +from metagpt.actions.ci.execute_nb_code import ExecuteNbCode from metagpt.utils.common import read_json_file from metagpt.utils.save_code import DATA_PATH, save_code_file