From a0efe97c71d70ba3bb20f51372fce57e8dbc3f05 Mon Sep 17 00:00:00 2001 From: better629 Date: Fri, 29 Mar 2024 00:18:25 +0800 Subject: [PATCH] fix problem due to solve conflicts --- examples/android_assistant/run_assistant.py | 1 + .../android_env/test_android_ext_env.py | 6 +++--- .../metagpt/environment/mincraft_env/__init__.py | 3 --- .../mincraft_env/test_mincraft_ext_env.py | 15 --------------- .../test_stanford_town_ext_env.py | 1 - tests/metagpt/environment/test_base_env.py | 2 +- 6 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 tests/metagpt/environment/mincraft_env/__init__.py delete mode 100644 tests/metagpt/environment/mincraft_env/test_mincraft_ext_env.py diff --git a/examples/android_assistant/run_assistant.py b/examples/android_assistant/run_assistant.py index 9ec9e39ef..fe8a40fda 100644 --- a/examples/android_assistant/run_assistant.py +++ b/examples/android_assistant/run_assistant.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # @Desc : the entry of android assistant including learning and acting stage +# See the usage README inside `metagpt/ext/android_assistant` import asyncio from pathlib import Path diff --git a/tests/metagpt/environment/android_env/test_android_ext_env.py b/tests/metagpt/environment/android_env/test_android_ext_env.py index 3fb77ab24..937cf5f6e 100644 --- a/tests/metagpt/environment/android_env/test_android_ext_env.py +++ b/tests/metagpt/environment/android_env/test_android_ext_env.py @@ -16,8 +16,8 @@ def mock_device_shape_invalid(self, adb_cmd: str) -> str: return ADB_EXEC_FAIL -def mock_list_devices(self, adb_cmd: str) -> str: - return "devices\nemulator-5554" +def mock_list_devices(self) -> str: + return ["emulator-5554"] def mock_get_screenshot(self, adb_cmd: str) -> str: @@ -35,6 +35,7 @@ def mock_write_read_operation(self, adb_cmd: str) -> str: def test_android_ext_env(mocker): device_id = "emulator-5554" mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.execute_adb_with_cmd", mock_device_shape) + mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.list_devices", mock_list_devices) ext_env = AndroidExtEnv(device_id=device_id, screenshot_dir="/data2/", xml_dir="/data2/") assert ext_env.adb_prefix == f"adb -s {device_id} " @@ -48,7 +49,6 @@ def test_android_ext_env(mocker): ) assert ext_env.device_shape == (0, 0) - mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.execute_adb_with_cmd", mock_list_devices) assert ext_env.list_devices() == [device_id] mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.execute_adb_with_cmd", mock_get_screenshot) diff --git a/tests/metagpt/environment/mincraft_env/__init__.py b/tests/metagpt/environment/mincraft_env/__init__.py deleted file mode 100644 index 2bcf8efd0..000000000 --- a/tests/metagpt/environment/mincraft_env/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# @Desc : diff --git a/tests/metagpt/environment/mincraft_env/test_mincraft_ext_env.py b/tests/metagpt/environment/mincraft_env/test_mincraft_ext_env.py deleted file mode 100644 index 6cc634fd9..000000000 --- a/tests/metagpt/environment/mincraft_env/test_mincraft_ext_env.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# @Desc : the unittest of MincraftExtEnv - - -from metagpt.const import MC_CKPT_DIR -from metagpt.environment.mincraft_env.mincraft_ext_env import MincraftExtEnv - - -def test_mincraft_ext_env(): - ext_env = MincraftExtEnv() - - assert ext_env.server, f"{ext_env.server_host}:{ext_env.server_port}" - assert MC_CKPT_DIR.joinpath("skill/code").exists() - assert ext_env.warm_up.get("optional_inventory_items") == 7 diff --git a/tests/metagpt/environment/stanford_town_env/test_stanford_town_ext_env.py b/tests/metagpt/environment/stanford_town_env/test_stanford_town_ext_env.py index f28589467..282a45dfa 100644 --- a/tests/metagpt/environment/stanford_town_env/test_stanford_town_ext_env.py +++ b/tests/metagpt/environment/stanford_town_env/test_stanford_town_ext_env.py @@ -33,7 +33,6 @@ def test_stanford_town_ext_env(): assert len(ext_env.get_nearby_tiles(tile=tile, vision_r=5)) == 121 event = ("double studio:double studio:bedroom 2:bed", None, None, None) - ext_env.add_tiles_event(tile[1], tile[0], event=event) ext_env.add_event_from_tile(event, tile) assert len(ext_env.tiles[tile[1]][tile[0]]["events"]) == 1 diff --git a/tests/metagpt/environment/test_base_env.py b/tests/metagpt/environment/test_base_env.py index 404f1c206..c4f881748 100644 --- a/tests/metagpt/environment/test_base_env.py +++ b/tests/metagpt/environment/test_base_env.py @@ -64,7 +64,7 @@ async def test_ext_env(): _ = await env.write_thru_api(EnvAPIAbstract(api_name="write_api", kwargs={"a": 5, "b": 10})) assert env.value == 15 - with pytest.raises(ValueError): + with pytest.raises(KeyError): await env.read_from_api("not_exist_api") assert await env.read_from_api("read_api_no_param") == 15