Merge branch 'dev' of https://github.com/geekan/MetaGPT into geekan/dev

metagpt/actions/write_prd_an.py

@@ -8,7 +8,6 @@
 from typing import List
 
 from metagpt.actions.action_node import ActionNode
-from metagpt.logs import logger
 
 LANGUAGE = ActionNode(
     key="Language",
@@ -34,7 +33,8 @@ ORIGINAL_REQUIREMENTS = ActionNode(
 PROJECT_NAME = ActionNode(
     key="Project Name",
     expected_type=str,
-    instruction="According to the content of \"Original Requirements,\" name the project using snake case style , like 'game_2048' or 'simple_crm.",
+    instruction='According to the content of "Original Requirements," name the project using snake case style , '
+    "like 'game_2048' or 'simple_crm.",
     example="game_2048",
 )
 
@@ -155,12 +155,3 @@ NODES = [
 WRITE_PRD_NODE = ActionNode.from_children("WritePRD", NODES)
 WP_ISSUE_TYPE_NODE = ActionNode.from_children("WP_ISSUE_TYPE", [ISSUE_TYPE, REASON])
 WP_IS_RELATIVE_NODE = ActionNode.from_children("WP_IS_RELATIVE", [IS_RELATIVE, REASON])
-
-
-def main():
-    prompt = WRITE_PRD_NODE.compile(context="")
-    logger.info(prompt)
-
-
-if __name__ == "__main__":
-    main()

metagpt/memory/longterm_memory.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 """
 @Desc   : the implement of Long-term memory
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
 """
 
 from typing import Optional

metagpt/memory/memory_storage.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 """
 @Desc   : the implement of memory storage
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
 """
 
 from pathlib import Path

metagpt/provider/azure_openai_api.py

@@ -3,8 +3,6 @@
 @Time    : 2023/5/5 23:08
 @Author  : alexanderwu
 @File    : openai.py
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation;
-            Change cost control from global to company level.
 @Modified By: mashenquan, 2023/11/21. Fix bug: ReadTimeout.
 @Modified By: mashenquan, 2023/12/1. Fix bug: Unclosed connection caused by openai 0.x.
 """

metagpt/provider/fireworks_api.py

@@ -84,7 +84,7 @@ class FireworksLLM(OpenAILLM):
     def _update_costs(self, usage: CompletionUsage):
         if self.config.calc_usage and usage:
             try:
-                # use FireworksCostManager not CONFIG.cost_manager
+                # use FireworksCostManager not CONTEXT.cost_manager
                 self.cost_manager.update_cost(usage.prompt_tokens, usage.completion_tokens, self.model)
             except Exception as e:
                 logger.error(f"updating costs failed!, exp: {e}")

metagpt/provider/openai_api.py

@@ -3,8 +3,6 @@
 @Time    : 2023/5/5 23:08
 @Author  : alexanderwu
 @File    : openai.py
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for isolation;
-            Change cost control from global to company level.
 @Modified By: mashenquan, 2023/11/21. Fix bug: ReadTimeout.
 @Modified By: mashenquan, 2023/12/1. Fix bug: Unclosed connection caused by openai 0.x.
 """

metagpt/roles/role.py

@@ -103,7 +103,7 @@ class RoleContext(BaseModel):
     max_react_loop: int = 1
 
     def check(self, role_id: str):
-        # if hasattr(CONFIG, "long_term_memory") and CONFIG.long_term_memory:
+        # if hasattr(CONFIG, "enable_longterm_memory") and CONFIG.enable_longterm_memory:
         #     self.long_term_memory.recover_memory(role_id, self)
         #     self.memory = self.long_term_memory  # use memory to act as long_term_memory for unify operation
         pass

metagpt/tools/web_browser_engine.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
-"""
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
-"""
+# -*- coding: utf-8 -*-
 
 from __future__ import annotations
 

metagpt/tools/web_browser_engine_playwright.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
-"""
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
-"""
+# -*- coding: utf-8 -*-
 
 from __future__ import annotations
 

metagpt/tools/web_browser_engine_selenium.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
-"""
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
-"""
+# -*- coding: utf-8 -*-
 
 from __future__ import annotations
 

metagpt/utils/mermaid.py

@@ -4,7 +4,6 @@
 @Time    : 2023/7/4 10:53
 @Author  : alexanderwu alitrack
 @File    : mermaid.py
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
 """
 import asyncio
 import os

tests/conftest.py

@@ -30,7 +30,6 @@ ALLOW_OPENAI_API_CALL = int(
 
 @pytest.fixture(scope="session")
 def rsp_cache():
-    # model_version = CONFIG.openai_api_model
     rsp_cache_file_path = TEST_DATA_PATH / "rsp_cache.json"  # read repo-provided
     new_rsp_cache_file_path = TEST_DATA_PATH / "rsp_cache_new.json"  # exporting a new copy
     if os.path.exists(rsp_cache_file_path):

tests/metagpt/memory/test_longterm_memory.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 """
 @Desc   : unittest of `metagpt/memory/longterm_memory.py`
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
 """
 
 import os

tests/metagpt/provider/test_zhipuai_api.py

@@ -82,6 +82,7 @@ async def test_zhipuai_acompletion(mocker):
 
 
 def test_zhipuai_proxy():
-    # CONFIG.openai_proxy = "http://127.0.0.1:8080"
+    # it seems like zhipuai would be inflected by the proxy of openai, maybe it's a bug
+    # but someone may want to use openai.proxy, so we keep this test case
+    # assert openai.proxy == config.llm.proxy
     _ = ZhiPuAILLM(mock_llm_config_zhipu)
-    # assert openai.proxy == CONFIG.openai_proxy

tests/metagpt/roles/test_role.py

@@ -3,7 +3,7 @@
 # @Desc   : unittest of Role
 import pytest
 
-from metagpt.llm import HumanProvider
+from metagpt.provider.human_provider import HumanProvider
 from metagpt.roles.role import Role
 
 

tests/metagpt/test_context_mixin.py

@@ -125,4 +125,3 @@ async def test_config_priority():
     assert a3.llm.model == "gpt-3.5-turbo-1106"
 
     # history = await team.run(idea="Topic: climate change. Under 80 words per message.", send_to="a1", n_round=3)
-    # assert "Alex" in history

tests/metagpt/test_environment.py

@@ -4,8 +4,6 @@
 @Time    : 2023/5/12 00:47
 @Author  : alexanderwu
 @File    : test_environment.py
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
-
 """
 
 from pathlib import Path

tests/metagpt/test_llm.py

@@ -4,7 +4,6 @@
 @Time    : 2023/5/11 14:45
 @Author  : alexanderwu
 @File    : test_llm.py
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
 """
 
 import pytest

tests/metagpt/tools/test_web_browser_engine.py

@@ -1,6 +1,5 @@
-"""
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
-"""
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 import pytest
 

tests/metagpt/tools/test_web_browser_engine_playwright.py

@@ -1,6 +1,5 @@
-"""
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
-"""
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 import pytest
 

tests/metagpt/tools/test_web_browser_engine_selenium.py

@@ -1,6 +1,5 @@
-"""
-@Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
-"""
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 import pytest