From a6cd05ac53e5bfe69276825aa0965d853251c641 Mon Sep 17 00:00:00 2001 From: stellahsr Date: Thu, 12 Oct 2023 22:48:49 +0800 Subject: [PATCH] update: 1. add round_id for role when resume 2. use ; instead of , to log tasks --- metagpt/minecraft_team.py | 137 ++++++++++---------- metagpt/roles/minecraft/curriculum_agent.py | 4 +- 2 files changed, 68 insertions(+), 73 deletions(-) diff --git a/metagpt/minecraft_team.py b/metagpt/minecraft_team.py index 3e92348b7..8ea2eb3a4 100644 --- a/metagpt/minecraft_team.py +++ b/metagpt/minecraft_team.py @@ -32,7 +32,7 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): """ 游戏环境的记忆，用于多个agent进行信息的共享和缓存，而不需要重复在自己的角色内维护缓存 """ - + event: dict[str, Any] = Field(default_factory=dict) current_task: str = Field(default="Mine 1 wood log") task_execution_time: float = Field(default=float) @@ -46,30 +46,30 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): skills: dict = Field(default_factory=dict) # for skills.json retrieve_skills: list[str] = Field(default_factory=list) event_summary: str = Field(default="") - + qa_cache: dict[str, str] = Field(default_factory=dict) completed_tasks: list[str] = Field(default_factory=list) # Critique things failed_tasks: list[str] = Field(default_factory=list) - + skill_desp: str = Field(default="") - + chest_memory: dict[str, Any] = Field( default_factory=dict ) # eg: {'(1344, 64, 1381)': 'Unknown'} chest_observation: str = Field(default="") # eg: "Chests: None\n\n" - + mf_instance: MineflayerEnv = Field(default_factory=MineflayerEnv) runtime_status: bool = False # equal to action execution status: success or failed - + vectordb: Chroma = Field(default_factory=Chroma) - + qa_cache_questions_vectordb: Chroma = Field(default_factory=Chroma) - + @property def progress(self): # return len(self.completed_tasks) + 10 # Test only return len(self.completed_tasks) - + @property def programs(self): programs = "" @@ -80,53 +80,51 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): for primitives in load_skills_code(): programs += f"{primitives}\n\n" return programs - + @property def warm_up(self): return self.mf_instance.warm_up - + @property def core_inv_items_regex(self): return self.mf_instance.core_inv_items_regex - - + def set_mc_port(self, mc_port): self.mf_instance.set_mc_port(mc_port) self.set_mc_resume() - + def set_mc_resume(self): self.qa_cache_questions_vectordb = Chroma( collection_name="qa_cache_questions_vectordb", embedding_function=OpenAIEmbeddings(), persist_directory=f"{CKPT_DIR}/curriculum/vectordb", ) - + self.vectordb = Chroma( collection_name="skill_vectordb", embedding_function=OpenAIEmbeddings(), persist_directory=f"{CKPT_DIR}/skill/vectordb", ) - - + if CONFIG.resume: logger.info(f"Loading Action Developer from {CKPT_DIR}/action") with open(f"{CKPT_DIR}/action/chest_memory.json", "r") as f: self.chest_memory = json.load(f) - + logger.info(f"Loading Curriculum Agent from {CKPT_DIR}/curriculum") with open(f"{CKPT_DIR}/curriculum/completed_tasks.json", "r") as f: self.completed_tasks = json.load(f) with open(f"{CKPT_DIR}/curriculum/failed_tasks.json", "r") as f: self.failed_tasks = json.load(f) - + logger.info(f"Loading Skill Manager from {CKPT_DIR}/skill\033[0m") with open(f"{CKPT_DIR}/skill/skills.json", "r") as f: self.skills = json.load(f) - + logger.info(f"Loading Qa Cache from {CKPT_DIR}/curriculum\033[0m") with open(f"{CKPT_DIR}/curriculum/qa_cache.json", "r") as f: self.qa_cache = json.load(f) - + if self.vectordb._collection.count() == 0: logger.info(self.vectordb._collection.count()) # Set vdvs for skills & qa_cache @@ -144,17 +142,15 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): metadatas=metadatas, ) self.vectordb.persist() - - + logger.info(self.qa_cache_questions_vectordb._collection.count()) if self.qa_cache_questions_vectordb._collection.count() == 0: - questions = [question for question, answer in self.qa_cache.items()] - + self.qa_cache_questions_vectordb.add_texts(texts=questions) - + self.qa_cache_questions_vectordb.persist() - + logger.info( f"INIT_CHECK: There are {self.vectordb._collection.count()} skills in vectordb and {len(self.skills)} skills in skills.json." ) @@ -165,7 +161,7 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): f"Did you set resume=False when initializing the manager?\n" f"You may need to manually delete the vectordb directory for running from scratch." ) - + logger.info( f"INIT_CHECK: There are {self.qa_cache_questions_vectordb._collection.count()} qa_cache in vectordb and {len(self.qa_cache)} questions in qa_cache.json." ) @@ -178,49 +174,48 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): f"Did you set resume=False when initializing the agent?\n" f"You may need to manually delete the qa cache question vectordb directory for running from scratch.\n" ) - - + def register_roles(self, roles: Iterable[Minecraft]): for role in roles: role.set_memory(self) - + def update_event(self, event: Dict): if self.event == event: return self.event = event # self.update_chest_memory(event) # self.event_summary = self.summarize_chatlog(event) - + def update_task(self, task: str): self.current_task = task - + def update_context(self, context: str): self.context = context - + def update_program_code(self, program_code: str): self.program_code = program_code - + def update_code(self, code: str): self.code = code # action_developer.gen_action_code to HERE - + def update_program_name(self, program_name: str): self.program_name = program_name - + def update_critique(self, critique: str): self.critique = critique # critic_agent.check_task_success to HERE - + def append_skill(self, skill: dict): self.skills[self.program_name] = skill # skill_manager.retrieve_skills to HERE - + def update_retrieve_skills(self, retrieve_skills: list): self.retrieve_skills = retrieve_skills - + def update_skill_desp(self, skill_desp: str): self.skill_desp = skill_desp - + async def update_qa_cache(self, qa_cache: dict): self.qa_cache = qa_cache - + def update_chest_memory(self, events: Dict): """ Input: events: Dict @@ -240,13 +235,13 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): self.chest_memory[position] = chest with open(f"{CKPT_DIR}/action/chest_memory.json", "w") as f: json.dump(self.chest_memory, f) - + def update_chest_observation(self): """ update chest_memory to chest_observation. Refer to @ https://github.com/MineDojo/Voyager/blob/main/voyager/agents/action.py """ - + chests = [] for chest_position, chest in self.chest_memory.items(): if isinstance(chest, dict) and len(chest) > 0: @@ -264,7 +259,7 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): self.chest_observation = f"Chests:\n{chests}\n\n" else: self.chest_observation = f"Chests: None\n\n" - + def summarize_chatlog(self, events): def filter_item(message: str): craft_pattern = r"I cannot make \w+ because I need: (.*)" @@ -280,7 +275,7 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): self.event_summary = re.match(mine_pattern, message).groups()[0] else: self.event_summary = "" - + chatlog = set() for event_type, event in events: if event_type == "onChat": @@ -290,11 +285,11 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): self.event_summary = ( "I also need " + ", ".join(chatlog) + "." if chatlog else "" ) - + def reset_block_info(self): # revert all the placing event in the last step pass - + def update_exploration_progress(self, success: bool): """ Split task into completed_tasks or failed_tasks @@ -330,9 +325,9 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): ) self.event[-1][1]["inventory"] = new_events[-1][1]["inventory"] self.event[-1][1]["voxels"] = new_events[-1][1]["voxels"] - + self.save_sorted_tasks() - + def save_sorted_tasks(self): updated_completed_tasks = [] # record repeated failed tasks @@ -341,21 +336,21 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): for task in self.completed_tasks: if task not in updated_completed_tasks: updated_completed_tasks.append(task) - + # remove completed tasks from failed tasks for task in updated_completed_tasks: while task in updated_failed_tasks: updated_failed_tasks.remove(task) - + self.completed_tasks = updated_completed_tasks self.failed_tasks = updated_failed_tasks - + # dump to json with open(f"{CKPT_DIR}/curriculum/completed_tasks.json", "w") as f: json.dump(self.completed_tasks, f) with open(f"{CKPT_DIR}/curriculum/failed_tasks.json", "w") as f: json.dump(self.failed_tasks, f) - + async def on_event_retrieve(self, *args): """ Retrieve Minecraft events. @@ -395,7 +390,7 @@ class GameEnvironment(BaseModel, arbitrary_types_allowed=True): self.update_event(events) logger.error(f"Failed to retrieve Minecraft events: {str(e)}") return events - + async def on_event_execute(self, *args): """ Execute Minecraft events. @@ -438,16 +433,16 @@ class MinecraftPlayer(SoftwareCompany): Software Company: Possesses a team, SOP (Standard Operating Procedures), and a platform for instant messaging, dedicated to writing executable code. """ - + environment: Environment = Field(default_factory=Environment) game_memory: GameEnvironment = Field(default_factory=GameEnvironment) investment: float = Field(default=50.0) task: str = Field(default="") game_info: dict = Field(default={}) - + def set_port(self, mc_port): self.game_memory.set_mc_port(mc_port) - + def check_complete_round(self): complete_round = [] for role in self.environment.roles.values(): @@ -459,19 +454,19 @@ class MinecraftPlayer(SoftwareCompany): complete_round_tag = all(complete_round) logger.info(f"complete_round {complete_round}") return complete_round_tag - - def update_round(self): + + def update_round(self, round_id): for role in self.environment.roles.values(): role.finish_step = False - role.round_id += 1 + role.round_id = round_id + 1 role._rc.todo = None role.finish_state = len(role._actions) logger.info(f"round_id:{role.round_id}") - + def hire(self, roles: list[Role]): self.environment.add_roles(roles) self.game_memory.register_roles(roles) - + def start(self, task, round=0): """Start a project from publishing boss requirement.""" self.task = task @@ -479,14 +474,14 @@ class MinecraftPlayer(SoftwareCompany): Message(role="Player", content=task, cause_by=PlayerActions, round_id=round) ) logger.info(self.game_info) - + def _save(self): logger.info(self.json()) - + def _reset(self): for role_profile, role in self.environment.roles.items(): role.reset_state() - + async def run(self, n_round=3): """Run company until target round or no money""" round_id = 0 @@ -510,26 +505,26 @@ class MinecraftPlayer(SoftwareCompany): "wait_ticks": 20, } ) - + events = self.game_memory.mf_instance.step( code="", programs="", ) self.game_memory.update_event(events) - + while n_round > 0: # self._save() if self.check_complete_round(): n_round -= 1 - self.update_round() + self.update_round(round_id) round_id += 1 # add new task into env and continue # fixme: update self.task with open(f"{CKPT_DIR}/curriculum/round_id.json", "w") as f: json.dump({"last_round_id": round_id}, f) - + self.start(task=self.task, round=round_id) - + logger.info(f"{n_round=}") self._check_balance() await self.environment.run() diff --git a/metagpt/roles/minecraft/curriculum_agent.py b/metagpt/roles/minecraft/curriculum_agent.py index e8f704f3f..986e03785 100644 --- a/metagpt/roles/minecraft/curriculum_agent.py +++ b/metagpt/roles/minecraft/curriculum_agent.py @@ -80,12 +80,12 @@ class CurriculumDesigner(Base): ) completed_tasks = ( - ", ".join(self.game_memory.completed_tasks) + "; ".join(self.game_memory.completed_tasks) if self.game_memory.completed_tasks else "None" ) failed_tasks = ( - ", ".join(self.game_memory.failed_tasks) + "; ".join(self.game_memory.failed_tasks) if self.game_memory.failed_tasks else "None" )