Merge pull request #836 from better629/feat_new_env

Feat update code due to failed unittests

metagpt/llm.py

@@ -16,5 +16,5 @@ def LLM(llm_config: Optional[LLMConfig] = None, context: Context = None) -> Base
     """get the default llm provider if name is None"""
     ctx = context or Context()
     if llm_config is not None:
-        ctx.llm_with_cost_manager_from_llm_config(llm_config)
+        return ctx.llm_with_cost_manager_from_llm_config(llm_config)
     return ctx.llm()

metagpt/provider/google_gemini_api.py

@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 # @Desc   : Google Gemini LLM from https://ai.google.dev/tutorials/python_quickstart
 
+from typing import Optional, Union
+
 import google.generativeai as genai
 from google.ai import generativelanguage as glm
 from google.generativeai.generative_models import GenerativeModel
@@ -58,7 +60,7 @@ class GeminiLLM(BaseLLM):
     def __init_gemini(self, config: LLMConfig):
         genai.configure(api_key=config.api_key)
 
-    def _user_msg(self, msg: str) -> dict[str, str]:
+    def _user_msg(self, msg: str, images: Optional[Union[str, list[str]]] = None) -> dict[str, str]:
         # Not to change BaseLLM default functions but update with Gemini's conversation format.
         # You should follow the format.
         return {"role": "user", "parts": [msg]}

tests/data/environment/stanford_town/the_ville/matrix/maze_meta_info.json

@@ -0,0 +1,5 @@
+{"world_name": "the ville", 
+ "maze_width": 140,
+ "maze_height": 100,
+ "sq_tile_size": 32,
+ "special_constraint": ""}

tests/data/environment/stanford_town/the_ville/matrix/special_blocks/arena_blocks.csv

@@ -0,0 +1,63 @@
+32138, the Ville, artist's co-living space, Latoya Williams's room
+32148, the Ville, artist's co-living space, Latoya Williams's bathroom
+32158, the Ville, artist's co-living space, Rajiv Patel's room
+32168, the Ville, artist's co-living space, Rajiv Patel's bathroom
+32178, the Ville, artist's co-living space, Abigail Chen's room
+32188, the Ville, artist's co-living space, Abigail Chen's bathroom
+32198, the Ville, artist's co-living space, Francisco Lopez's room
+32139, the Ville, artist's co-living space, Francisco Lopez's bathroom
+32149, the Ville, artist's co-living space, Hailey Johnson's room
+32159, the Ville, artist's co-living space, Hailey Johnson's bathroom
+32179, the Ville, artist's co-living space, common room
+32189, the Ville, artist's co-living space, kitchen
+32199, the Ville, Arthur Burton's apartment, main room
+32140, the Ville, Arthur Burton's apartment, bathroom
+32150, the Ville, Ryan Park's apartment, main room
+32160, the Ville, Ryan Park's apartment, bathroom
+32170, the Ville, Isabella Rodriguez's apartment, main room
+32180, the Ville, Isabella Rodriguez's apartment, bathroom
+32190, the Ville, Giorgio Rossi's apartment, main room
+32200, the Ville, Giorgio Rossi's apartment, bathroom
+32141, the Ville, Carlos Gomez's apartment, main room
+32151, the Ville, Carlos Gomez's apartment, bathroom
+32161, the Ville, The Rose and Crown Pub, pub
+32171, the Ville, Hobbs Cafe, cafe
+32181, the Ville, Oak Hill College, classroom
+32191, the Ville, Oak Hill College, library
+32201, the Ville, Oak Hill College, hallway
+32142, the Ville, Johnson Park, park
+32152, the Ville, Harvey Oak Supply Store, supply store
+32162, the Ville, The Willows Market and Pharmacy, store
+32193, the Ville, Adam Smith's house, main room
+32203, the Ville, Adam Smith's house, bathroom
+32174, the Ville, Yuriko Yamamoto's house, main room
+32184, the Ville, Yuriko Yamamoto's house, bathroom
+32194, the Ville, Moore family's house, main room
+32204, the Ville, Moore family's house, bathroom
+32172, the Ville, Dorm for Oak Hill College, Klaus Mueller's room
+32182, the Ville, Dorm for Oak Hill College, Maria Lopez's room
+32192, the Ville, Dorm for Oak Hill College, Ayesha Khan's room
+32202, the Ville, Dorm for Oak Hill College, Wolfgang Schulz's room
+32143, the Ville, Dorm for Oak Hill College, man's bathroom
+32153, the Ville, Dorm for Oak Hill College, woman's bathroom
+32163, the Ville, Dorm for Oak Hill College, common room
+32173, the Ville, Dorm for Oak Hill College, kitchen
+32183, the Ville, Dorm for Oak Hill College, garden
+32205, the Ville, Tamara Taylor and Carmen Ortiz's house, Tamara Taylor's room
+32215, the Ville, Tamara Taylor and Carmen Ortiz's house, Carmen Ortiz's room
+32225, the Ville, Tamara Taylor and Carmen Ortiz's house, common room
+32235, the Ville, Tamara Taylor and Carmen Ortiz's house, kitchen
+32245, the Ville, Tamara Taylor and Carmen Ortiz's house, bathroom
+32255, the Ville, Tamara Taylor and Carmen Ortiz's house, garden
+32265, the Ville, Moreno family's house, Tom and Jane Moreno's bedroom
+32275, the Ville, Moreno family's house, empty bedroom
+32206, the Ville, Moreno family's house, common room
+32216, the Ville, Moreno family's house, kitchen
+32226, the Ville, Moreno family's house, bathroom
+32236, the Ville, Moreno family's house, garden
+32246, the Ville, Lin family's house, Mei and John Lin's bedroom
+32256, the Ville, Lin family's house, Eddy Lin's bedroom
+32266, the Ville, Lin family's house, common room
+32276, the Ville, Lin family's house, kitchen
+32207, the Ville, Lin family's house, bathroom
+32217, the Ville, Lin family's house, garden

tests/data/environment/stanford_town/the_ville/matrix/special_blocks/game_object_blocks.csv

@@ -0,0 +1,46 @@
+32227, the Ville, <all>, bed
+32237, the Ville, <all>, desk
+32247, the Ville, <all>, closet
+32257, the Ville, <all>, shelf
+32267, the Ville, <all>, easel
+32277, the Ville, <all>, bathroom sink
+32208, the Ville, <all>, shower
+32218, the Ville, <all>, toilet
+32228, the Ville, <all>, kitchen sink
+32238, the Ville, <all>, refrigerator
+32248, the Ville, <all>, toaster
+32258, the Ville, <all>, cooking area
+32268, the Ville, <all>, common room table
+32278, the Ville, <all>, common room sofa
+32209, the Ville, <all>, guitar
+32219, the Ville, <all>, microphone
+32229, the Ville, <all>, bar customer seating
+32239, the Ville, <all>, behind the bar counter
+32249, the Ville, <all>, behind the cafe counter
+32259, the Ville, <all>, cafe customer seating
+32269, the Ville, <all>, piano
+32279, the Ville, <all>, blackboard
+32210, the Ville, <all>, game console
+32220, the Ville, <all>, computer desk
+32230, the Ville, <all>, computer
+32240, the Ville, <all>, library sofa
+32250, the Ville, <all>, bookshelf
+32260, the Ville, <all>, library table
+32270, the Ville, <all>, classroom student seating
+32280, the Ville, <all>, classroom podium
+32211, the Ville, <all>, behind the pharmacy counter
+32221, the Ville, <all>, behind the grocery counter
+32231, the Ville, <all>, pharmacy store shelf
+32241, the Ville, <all>, grocery store shelf
+32251, the Ville, <all>, pharmacy store counter
+32261, the Ville, <all>, grocery store counter
+32271, the Ville, <all>, supply store product shelf
+32281, the Ville, <all>, behind the supply store counter
+32212, the Ville, <all>, supply store counter
+32222, the Ville, <all>, dorm garden
+32232, the Ville, <all>, house garden
+32242, the Ville, <all>, garden chair
+32252, the Ville, <all>, park garden
+32262, the Ville, <all>, harp
+32272, the Ville, <all>, lifting weight
+32282, the Ville, <all>, pool table

tests/data/environment/stanford_town/the_ville/matrix/special_blocks/sector_blocks.csv

@@ -0,0 +1,19 @@
+32135, the Ville, artist's co-living space
+32145, the Ville, Arthur Burton's apartment
+32155, the Ville, Ryan Park's apartment 
+32165, the Ville, Isabella Rodriguez's apartment
+32175, the Ville, Giorgio Rossi's apartment
+32185, the Ville, Carlos Gomez's apartment
+32195, the Ville, The Rose and Crown Pub
+32136, the Ville, Hobbs Cafe
+32146, the Ville, Oak Hill College
+32156, the Ville, Johnson Park
+32166, the Ville, Harvey Oak Supply Store
+32176, the Ville, The Willows Market and Pharmacy
+32186, the Ville, Adam Smith's house
+32196, the Ville, Yuriko Yamamoto's house
+32137, the Ville, Moore family's house
+32147, the Ville, Tamara Taylor and Carmen Ortiz's house
+32157, the Ville, Moreno family's house
+32167, the Ville, Lin family's house
+32177, the Ville, Dorm for Oak Hill College

tests/data/environment/stanford_town/the_ville/matrix/special_blocks/spawning_location_blocks.csv

@@ -0,0 +1,40 @@
+32285, the Ville, artist's co-living space, Latoya Williams's room, sp-A
+32295, the Ville, artist's co-living space, Rajiv Patel's room, sp-A
+32305, the Ville, artist's co-living space, Rajiv Patel's room, sp-B
+32315, the Ville, artist's co-living space, Abigail Chen's room, sp-A
+32286, the Ville, artist's co-living space, Francisco Lopez's room, sp-A
+32296, the Ville, artist's co-living space, Hailey Johnson's room, sp-A
+32306, the Ville, Arthur Burton's apartment, main room, sp-A
+32316, the Ville, Arthur Burton's apartment, main room, sp-B
+32287, the Ville, Ryan Park's apartment, main room, sp-A
+32297, the Ville, Ryan Park's apartment, main room, sp-B
+32307, the Ville, Isabella Rodriguez's apartment, main room, sp-A
+32317, the Ville, Isabella Rodriguez's apartment, main room, sp-B
+32288, the Ville, Giorgio Rossi's apartment, main room, sp-A
+32298, the Ville, Giorgio Rossi's apartment, main room, sp-B
+32308, the Ville, Carlos Gomez's apartment, main room, sp-A
+32318, the Ville, Carlos Gomez's apartment, main room, sp-B
+32289, the Ville, Adam Smith's house, main room, sp-A
+32299, the Ville, Adam Smith's house, main room, sp-B
+32309, the Ville, Yuriko Yamamoto's house, main room, sp-A
+32319, the Ville, Yuriko Yamamoto's house, main room, sp-B
+32290, the Ville, Moore family's house, main room, sp-A
+32300, the Ville, Moore family's house, main room, sp-B
+32310, the Ville, Tamara Taylor and Carmen Ortiz's house, Tamara Taylor's room, sp-A
+32320, the Ville, Tamara Taylor and Carmen Ortiz's house, Tamara Taylor's room, sp-B
+32291, the Ville, Tamara Taylor and Carmen Ortiz's house, Carmen Ortiz's room, sp-A
+32301, the Ville, Tamara Taylor and Carmen Ortiz's house, Carmen Ortiz's room, sp-B
+32311, the Ville, Moreno family's house, Tom and Jane Moreno's bedroom, sp-A
+32321, the Ville, Moreno family's house, Tom and Jane Moreno's bedroom, sp-B
+32292, the Ville, Moreno family's house, empty bedroom, sp-A
+32302, the Ville, Moreno family's house, empty bedroom, sp-B
+32312, the Ville, Lin family's house, Mei and John Lin's bedroom, sp-A
+32322, the Ville, Lin family's house, Mei and John Lin's bedroom, sp-B
+32293, the Ville, Lin family's house, Eddy Lin's bedroom, sp-A
+32303, the Ville, Lin family's house, Eddy Lin's bedroom, sp-B
+32313, the Ville, Dorm for Oak Hill College, Klaus Mueller's room, sp-A
+32323, the Ville, Dorm for Oak Hill College, Klaus Mueller's room, sp-B
+32294, the Ville, Dorm for Oak Hill College, Maria Lopez's room, sp-A
+32304, the Ville, Dorm for Oak Hill College, Ayesha Khan's room, sp-A
+32314, the Ville, Dorm for Oak Hill College, Ayesha Khan's room, sp-B
+32324, the Ville, Dorm for Oak Hill College, Wolfgang Schulz's room, sp-A

tests/data/environment/stanford_town/the_ville/matrix/special_blocks/world_blocks.csv

@@ -0,0 +1 @@
+32134, the Ville

tests/metagpt/actions/test_action_node.py

@@ -244,13 +244,19 @@ def test_create_model_class_with_mapping():
 
 
 @pytest.mark.asyncio
-async def test_action_node_with_image():
+async def test_action_node_with_image(mocker):
+    # add a mock to update model in unittest, due to the gloabl MockLLM
+    def _cons_kwargs(self, messages: list[dict], timeout=3, **extra_kwargs) -> dict:
+        kwargs = {"messages": messages, "temperature": 0.3, "model": "gpt-4-vision-preview"}
+        return kwargs
+
     invoice = ActionNode(
         key="invoice", expected_type=bool, instruction="if it's a invoice file, return True else False", example="False"
     )
 
     invoice_path = Path(__file__).parent.joinpath("..", "..", "data", "invoices", "invoice-2.png")
     img_base64 = encode_image(invoice_path)
+    mocker.patch("metagpt.provider.openai_api.OpenAILLM._cons_kwargs", _cons_kwargs)
     node = await invoice.fill(context="", llm=LLM(), images=[img_base64])
     assert node.instruct_content.invoice
 

tests/metagpt/utils/test_repair_llm_raw_output.py

@@ -135,7 +135,7 @@ def test_repair_json_format():
 }
 """
     target_output = """{
-    "Language": "en_us",  
+    "Language": "en_us",
     "Programming Language": "Python"
 }"""
     output = repair_llm_raw_output(output=raw_output, req_keys=[None], repair_type=RepairType.JSON)
@@ -148,7 +148,7 @@ def test_repair_json_format():
 }
 """
     target_output = """{
-    "Language": "en_us",  
+    "Language": "en_us",
     "Programming Language": "Python"
 }"""
     output = repair_llm_raw_output(output=raw_output, req_keys=[None], repair_type=RepairType.JSON)
@@ -161,7 +161,7 @@ def test_repair_json_format():
     }
     """
     target_output = """{
-        "Language": "#en_us#",  
+        "Language": "#en_us#",
         "Programming Language": "//Python # Code // Language//"
     }"""
     output = repair_llm_raw_output(output=raw_output, req_keys=[None], repair_type=RepairType.JSON)