Merge branch 'dev' into code_intepreter

examples/agent_creator.py

@@ -6,7 +6,7 @@ Author: garylin2099
 import re
 
 from metagpt.actions import Action
-from metagpt.config import CONFIG
+from metagpt.config2 import config
 from metagpt.const import METAGPT_ROOT
 from metagpt.logs import logger
 from metagpt.roles import Role
@@ -48,8 +48,8 @@ class CreateAgent(Action):
         pattern = r"```python(.*)```"
         match = re.search(pattern, rsp, re.DOTALL)
         code_text = match.group(1) if match else ""
-        CONFIG.workspace_path.mkdir(parents=True, exist_ok=True)
-        new_file = CONFIG.workspace_path / "agent_created_agent.py"
+        config.workspace.path.mkdir(parents=True, exist_ok=True)
+        new_file = config.workspace.path / "agent_created_agent.py"
         new_file.write_text(code_text)
         return code_text
 
@@ -61,7 +61,7 @@ class AgentCreator(Role):
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self._init_actions([CreateAgent])
+        self.set_actions([CreateAgent])
 
     async def _act(self) -> Message:
         logger.info(f"{self._setting}: to do {self.rc.todo}({self.rc.todo.name})")

examples/build_customized_agent.py

@@ -57,7 +57,7 @@ class SimpleCoder(Role):
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self._init_actions([SimpleWriteCode])
+        self.set_actions([SimpleWriteCode])
 
     async def _act(self) -> Message:
         logger.info(f"{self._setting}: to do {self.rc.todo}({self.rc.todo.name})")
@@ -76,7 +76,7 @@ class RunnableCoder(Role):
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self._init_actions([SimpleWriteCode, SimpleRunCode])
+        self.set_actions([SimpleWriteCode, SimpleRunCode])
         self._set_react_mode(react_mode=RoleReactMode.BY_ORDER.value)
 
     async def _act(self) -> Message:

examples/build_customized_multi_agents.py

@@ -46,7 +46,7 @@ class SimpleCoder(Role):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self._watch([UserRequirement])
-        self._init_actions([SimpleWriteCode])
+        self.set_actions([SimpleWriteCode])
 
 
 class SimpleWriteTest(Action):
@@ -75,7 +75,7 @@ class SimpleTester(Role):
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self._init_actions([SimpleWriteTest])
+        self.set_actions([SimpleWriteTest])
         # self._watch([SimpleWriteCode])
         self._watch([SimpleWriteCode, SimpleWriteReview])  # feel free to try this too
 
@@ -114,7 +114,7 @@ class SimpleReviewer(Role):
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self._init_actions([SimpleWriteReview])
+        self.set_actions([SimpleWriteReview])
         self._watch([SimpleWriteTest])
 
 

examples/debate.py

@@ -49,7 +49,7 @@ class Debator(Role):
 
     def __init__(self, **data: Any):
         super().__init__(**data)
-        self._init_actions([SpeakAloud])
+        self.set_actions([SpeakAloud])
         self._watch([UserRequirement, SpeakAloud])
 
     async def _observe(self) -> int:

examples/debate_simple.py

@@ -13,7 +13,9 @@ from metagpt.roles import Role
 from metagpt.team import Team
 
 action1 = Action(name="AlexSay", instruction="Express your opinion with emotion and don't repeat it")
+action1.llm.model = "gpt-4-1106-preview"
 action2 = Action(name="BobSay", instruction="Express your opinion with emotion and don't repeat it")
+action2.llm.model = "gpt-3.5-turbo-1106"
 alex = Role(name="Alex", profile="Democratic candidate", goal="Win the election", actions=[action1], watch=[action2])
 bob = Role(name="Bob", profile="Republican candidate", goal="Win the election", actions=[action2], watch=[action1])
 env = Environment(desc="US election live broadcast")

examples/llm_hello_world.py

@@ -23,6 +23,10 @@ async def main():
     # streaming mode, much slower
     await llm.acompletion_text(hello_msg, stream=True)
 
+    # check completion if exist to test llm complete functions
+    if hasattr(llm, "completion"):
+        logger.info(llm.completion(hello_msg))
+
 
 if __name__ == "__main__":
     asyncio.run(main())

examples/search_kb.py

@@ -8,7 +8,7 @@ import asyncio
 
 from langchain.embeddings import OpenAIEmbeddings
 
-from metagpt.config import CONFIG
+from metagpt.config2 import config
 from metagpt.const import DATA_PATH, EXAMPLE_PATH
 from metagpt.document_store import FaissStore
 from metagpt.logs import logger
@@ -16,7 +16,8 @@ from metagpt.roles import Sales
 
 
 def get_store():
-    embedding = OpenAIEmbeddings(openai_api_key=CONFIG.openai_api_key, openai_api_base=CONFIG.openai_base_url)
+    llm = config.get_openai_llm()
+    embedding = OpenAIEmbeddings(openai_api_key=llm.api_key, openai_api_base=llm.base_url)
     return FaissStore(DATA_PATH / "example.json", embedding=embedding)