Skip to content

Commit f500277

Browse files
committed
fix importerror in test
1 parent f783191 commit f500277

File tree

203 files changed

+349
-3779
lines changed

Some content is hidden

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

203 files changed

+349
-3779
lines changed

tests/config2.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ s3:
1414
secure: false
1515
bucket: "mock"
1616

17-
azure_tts_subscription_key: "xxx"
18-
azure_tts_region: "eastus"
19-
2017
iflytek_app_id: "xxx"
2118
iflytek_api_key: "xxx"
2219
iflytek_api_secret: "xxx"

tests/conftest.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import aiohttp.web
1818
import pytest
1919

20-
from metagpt.const import DEFAULT_WORKSPACE_ROOT, TEST_DATA_PATH
21-
from metagpt.context import Context as MetagptContext
22-
from metagpt.llm import LLM
23-
from metagpt.logs import logger
20+
from metagpt.core.const import DEFAULT_WORKSPACE_ROOT, TEST_DATA_PATH
21+
from metagpt.core.context import Context as MetagptContext
22+
from metagpt.core.llm import LLM
23+
from metagpt.core.logs import logger
2424
from metagpt.utils.git_repository import GitRepository
2525
from tests.mock.mock_aiohttp import MockAioResponse
2626
from tests.mock.mock_curl_cffi import MockCurlCffiResponse
@@ -62,8 +62,8 @@ def pytest_runtest_makereport(item, call):
6262
def llm_mock(rsp_cache, mocker, request):
6363
llm = MockLLM(allow_open_api_call=ALLOW_OPENAI_API_CALL)
6464
llm.rsp_cache = rsp_cache
65-
mocker.patch("metagpt.provider.base_llm.BaseLLM.aask", llm.aask)
66-
mocker.patch("metagpt.provider.base_llm.BaseLLM.aask_batch", llm.aask_batch)
65+
mocker.patch("metagpt.core.provider.base_llm.BaseLLM.aask", llm.aask)
66+
mocker.patch("metagpt.core.provider.base_llm.BaseLLM.aask_batch", llm.aask_batch)
6767
mocker.patch("metagpt.provider.openai_api.OpenAILLM.aask_code", llm.aask_code)
6868
yield mocker
6969
if hasattr(request.node, "test_outcome") and request.node.test_outcome.passed:

tests/metagpt/actions/di/test_write_analysis_code.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22

33
from metagpt.actions.di.write_analysis_code import WriteAnalysisCode
4-
from metagpt.schema import Message
4+
from metagpt.core.schema import Message
55

66

77
@pytest.mark.asyncio

tests/metagpt/actions/di/test_write_plan.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
WritePlan,
77
precheck_update_plan_from_rsp,
88
)
9-
from metagpt.schema import Message
9+
from metagpt.core.schema import Message
1010

1111

1212
def test_precheck_update_plan_from_rsp():

tests/metagpt/actions/requirement_analysis/requirement/test_pic2txt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import pytest
22

33
from metagpt.actions.requirement_analysis.requirement.pic2txt import Pic2Txt
4-
from metagpt.const import TEST_DATA_PATH
5-
from metagpt.utils.common import aread
4+
from metagpt.core.const import TEST_DATA_PATH
5+
from metagpt.core.utils.common import aread
66

77

88
@pytest.mark.asyncio

tests/metagpt/actions/test_action.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"""
88
import pytest
99

10-
from metagpt.actions import Action, ActionType, WritePRD, WriteTest
10+
from metagpt.actions.write_prd import WritePRD
11+
from metagpt.actions.write_test import WriteTest
12+
from metagpt.core.actions import Action, ActionType
1113

1214

1315
def test_action_repr():

tests/metagpt/actions/test_action_multi_llm.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from metagpt.actions.action import Action
2-
from metagpt.config2 import Config
3-
from metagpt.const import TEST_DATA_PATH
4-
from metagpt.context import Context
5-
from metagpt.provider.llm_provider_registry import create_llm_instance
6-
from metagpt.roles.role import Role
1+
from metagpt.core.actions import Action
2+
from metagpt.core.config2 import Config
3+
from metagpt.core.const import TEST_DATA_PATH
4+
from metagpt.core.context import Context
5+
from metagpt.core.provider.llm_provider_registry import create_llm_instance
6+
from metagpt.core.roles.role import Role
77

88

99
def test_set_llm():

tests/metagpt/actions/test_action_node.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import pytest
1212
from pydantic import BaseModel, Field, ValidationError
1313

14-
from metagpt.actions import Action
15-
from metagpt.actions.action_node import ActionNode, ReviewMode, ReviseMode
14+
from metagpt.core.actions import Action
15+
from metagpt.core.actions.action_node import ActionNode, ReviewMode, ReviseMode
16+
from metagpt.core.llm import LLM
17+
from metagpt.core.roles import Role
18+
from metagpt.core.schema import Message
19+
from metagpt.core.utils.common import encode_image
1620
from metagpt.environment import Environment
17-
from metagpt.llm import LLM
18-
from metagpt.roles import Role
19-
from metagpt.schema import Message
2021
from metagpt.team import Team
21-
from metagpt.utils.common import encode_image
2222

2323

2424
@pytest.mark.asyncio

tests/metagpt/actions/test_action_outcls_registry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from typing import List
66

7-
from metagpt.actions.action_node import ActionNode
7+
from metagpt.core.actions.action_node import ActionNode
88

99

1010
def test_action_outcls_registry():

tests/metagpt/actions/test_debug_error.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import pytest
1212

13-
from metagpt.actions.debug_error import DebugError
14-
from metagpt.schema import RunCodeContext, RunCodeResult
13+
from metagpt.actions import DebugError
14+
from metagpt.core.schema import RunCodeContext, RunCodeResult
1515

1616
CODE_CONTENT = '''
1717
from typing import List

0 commit comments

Comments
 (0)