Merge branch 'geekan:dev' into dev

docs/scripts/coverage.sh

@@ -1 +1 @@
-coverage run --source ./metagpt -m pytest && coverage report -m && coverage html && open htmlcov/index.html
+coverage run --source ./metagpt -m pytest --durations=0 && coverage report -m && coverage html && open htmlcov/index.html

metagpt/actions/project_management.py

@@ -89,9 +89,6 @@ class WriteTasks(Action):
 
     async def _run_new_tasks(self, context, schema=CONFIG.prompt_schema):
         node = await PM_NODE.fill(context, self.llm, schema)
-        # prompt_template, format_example = get_template(templates, format)
-        # prompt = prompt_template.format(context=context, format_example=format_example)
-        # rsp = await self._aask_v1(prompt, "task", OUTPUT_MAPPING, format=format)
         return node
 
     async def _merge(self, system_design_doc, task_doc, schema=CONFIG.prompt_schema) -> Document:

metagpt/provider/base_llm.py

@@ -43,7 +43,7 @@ class BaseLLM(ABC):
         if system_msgs:
             message = self._system_msgs(system_msgs)
         else:
-            message = [self._default_system_msg()]
+            message = [self._default_system_msg()] if self.use_system_prompt else []
         if format_msgs:
             message.extend(format_msgs)
         message.append(self._user_msg(msg))

metagpt/provider/fireworks_api.py

@@ -64,8 +64,9 @@ class FireworksCostManager(CostManager):
         token_costs = self.model_grade_token_costs(model)
         cost = (prompt_tokens * token_costs["prompt"] + completion_tokens * token_costs["completion"]) / 1000000
         self.total_cost += cost
+        max_budget = CONFIG.max_budget if CONFIG.max_budget else CONFIG.cost_manager.max_budget
         logger.info(
-            f"Total running cost: ${self.total_cost:.4f} | Max budget: ${CONFIG.max_budget:.3f} | "
+            f"Total running cost: ${self.total_cost:.4f} | Max budget: ${max_budget:.3f} | "
             f"Current cost: ${cost:.4f}, prompt_tokens: {prompt_tokens}, completion_tokens: {completion_tokens}"
         )
         CONFIG.total_cost = self.total_cost

metagpt/provider/ollama_api.py

@@ -30,9 +30,9 @@ class OllamaCostManager(CostManager):
         """
         self.total_prompt_tokens += prompt_tokens
         self.total_completion_tokens += completion_tokens
-
+        max_budget = CONFIG.max_budget if CONFIG.max_budget else CONFIG.cost_manager.max_budget
         logger.info(
-            f"Max budget: ${CONFIG.max_budget:.3f} | "
+            f"Max budget: ${max_budget:.3f} | "
             f"prompt_tokens: {prompt_tokens}, completion_tokens: {completion_tokens}"
         )
         CONFIG.total_cost = self.total_cost

metagpt/provider/open_llm_api.py

@@ -26,9 +26,9 @@ class OpenLLMCostManager(CostManager):
         """
         self.total_prompt_tokens += prompt_tokens
         self.total_completion_tokens += completion_tokens
-
+        max_budget = CONFIG.max_budget if CONFIG.max_budget else CONFIG.cost_manager.max_budget
         logger.info(
-            f"Max budget: ${CONFIG.max_budget:.3f} | reference "
+            f"Max budget: ${max_budget:.3f} | reference "
             f"prompt_tokens: {prompt_tokens}, completion_tokens: {completion_tokens}"
         )
 

metagpt/provider/zhipuai/zhipu_model_api.py

@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 # @Desc   : zhipu model api to support sync & async for invoke & sse_invoke
 
+import json
+
 import zhipuai
 from zhipuai.model_api.api import InvokeType, ModelAPI
 from zhipuai.utils.http_client import headers as zhipuai_default_headers
@@ -51,7 +53,6 @@ class ZhiPuModelAPI(ModelAPI):
             params=kwargs,
             request_timeout=zhipuai.api_timeout_seconds,
         )
-
         return result
 
     @classmethod
@@ -61,6 +62,8 @@ class ZhiPuModelAPI(ModelAPI):
         resp = await cls.arequest(
             invoke_type=InvokeType.SYNC, stream=False, method="post", headers=headers, kwargs=kwargs
         )
+        resp = resp.decode("utf-8")
+        resp = json.loads(resp)
         return resp
 
     @classmethod

metagpt/provider/zhipuai_api.py

@@ -38,12 +38,11 @@ class ZhiPuAILLM(BaseLLM):
     From now, there is only one model named `chatglm_turbo`
     """
 
-    use_system_prompt: bool = False  # zhipuai has no system prompt when use api
-
     def __init__(self):
         self.__init_zhipuai(CONFIG)
         self.llm = ZhiPuModelAPI
         self.model = "chatglm_turbo"  # so far only one model, just use it
+        self.use_system_prompt: bool = False  # zhipuai has no system prompt when use api
 
     def __init_zhipuai(self, config: CONFIG):
         assert config.zhipuai_api_key
@@ -101,7 +100,6 @@ class ZhiPuAILLM(BaseLLM):
             elif event.event == ZhiPuEvent.ERROR.value or event.event == ZhiPuEvent.INTERRUPTED.value:
                 content = event.data
                 logger.error(f"event error: {content}", end="")
-                collected_content.append([content])
             elif event.event == ZhiPuEvent.FINISH.value:
                 """
                 event.meta

metagpt/strategy/tot.py

@@ -5,7 +5,7 @@
 import asyncio
 from typing import Any, List
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from metagpt.llm import LLM
 from metagpt.logs import logger
@@ -29,6 +29,8 @@ Output a list of jsons following the format:
 
 
 class ThoughtSolverBase(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     thought_tree: str = ""
     llm: BaseLLM = Field(default_factory=LLM, exclude=True)
     config: ThoughtSolverConfig = Field(default_factory=ThoughtSolverConfig)

metagpt/utils/get_template.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-@Time    : 2023/9/19 20:39
-@Author  : femto Zheng
-@File    : get_template.py
-"""
-from metagpt.config import CONFIG
-
-
-def get_template(templates, schema=CONFIG.prompt_schema):
-    selected_templates = templates.get(schema)
-    if selected_templates is None:
-        raise ValueError(f"Can't find {schema} in passed in templates")
-
-    # Extract the selected templates
-    prompt_template = selected_templates["PROMPT_TEMPLATE"]
-    format_example = selected_templates["FORMAT_EXAMPLE"]
-
-    return prompt_template, format_example

requirements.txt

@@ -58,3 +58,4 @@ websockets~=12.0
 networkx~=3.2.1
 google-generativeai==0.3.1
 playwright==1.40.0
+anytree

tests/metagpt/provider/test_openai.py

@@ -8,8 +8,6 @@ from metagpt.schema import UserMessage
 
 CONFIG.openai_proxy = None
 
-print("openai_api_key ", CONFIG.openai_api_key)
-
 
 @pytest.mark.asyncio
 async def test_aask_code():

tests/metagpt/strategy/__init__.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/12/30 00:33
+@Author  : alexanderwu
+@File    : __init__.py
+"""

tests/metagpt/strategy/examples/creative_writing.py

@@ -3,8 +3,8 @@
 # @Author  : stellahong (stellahong@fuzhi.ai)
 # @Desc    :
 import re
+from typing import Dict
 
-from metagpt.strategy.prompt_templates.creative_writing import cot_prompt, vote_prompt
 from metagpt.strategy.tot import TreeofThought
 from metagpt.strategy.tot_schema import (
     BaseEvaluator,
@@ -12,6 +12,10 @@ from metagpt.strategy.tot_schema import (
     Strategy,
     ThoughtSolverConfig,
 )
+from tests.metagpt.strategy.prompt_templates.creative_writing import (
+    cot_prompt,
+    vote_prompt,
+)
 
 
 class TextGenParser(BaseParser):
@@ -31,8 +35,8 @@ class TextGenParser(BaseParser):
 
 
 class TextGenEvaluator(BaseEvaluator):
-    value_map = {"impossible": 0.001, "likely": 1, "sure": 20}  # TODO: ad hoc
-    status_map = {val: key for key, val in value_map.items()}
+    value_map: Dict[str, float] = {"impossible": 0.001, "likely": 1, "sure": 20}  # TODO: ad hoc
+    status_map: Dict = {val: key for key, val in value_map.items()}
 
     def __call__(self, evaluation: str, **kwargs) -> float:
         try:
@@ -59,7 +63,7 @@ class TextGenEvaluator(BaseEvaluator):
         return status
 
 
-if __name__ == "__main__":
+def test_creative_writing():
     import asyncio
 
     initial_prompt = """It isn't difficult to do a handstand if you just stand on your hands. It caught him off guard that space smelled of seared steak. When she didn’t like a guy who was trying to pick her up, she started using sign language. Each person who knows you has a different perception of who you are."""

tests/metagpt/strategy/examples/game24.py

@@ -3,8 +3,8 @@
 # @Author  : stellahong (stellahong@fuzhi.ai)
 # @Desc    :
 import re
+from typing import Dict
 
-from metagpt.strategy.prompt_templates.game24 import propose_prompt, value_prompt
 from metagpt.strategy.tot import TreeofThought
 from metagpt.strategy.tot_schema import (
     BaseEvaluator,
@@ -12,6 +12,7 @@ from metagpt.strategy.tot_schema import (
     Strategy,
     ThoughtSolverConfig,
 )
+from tests.metagpt.strategy.prompt_templates.game24 import propose_prompt, value_prompt
 
 
 class Game24Parser(BaseParser):
@@ -31,8 +32,8 @@ class Game24Parser(BaseParser):
 
 
 class Game24Evaluator(BaseEvaluator):
-    value_map = {"impossible": 0.001, "likely": 1, "sure": 20}  # TODO: ad hoc
-    status_map = {val: key for key, val in value_map.items()}
+    value_map: Dict[str, float] = {"impossible": 0.001, "likely": 1, "sure": 20}  # TODO: ad hoc
+    status_map: Dict = {val: key for key, val in value_map.items()}
 
     def __call__(self, evaluation: str, **kwargs) -> float:
         try:
@@ -51,7 +52,7 @@ class Game24Evaluator(BaseEvaluator):
         return status
 
 
-if __name__ == "__main__":
+def test_game24():
     import asyncio
 
     initial_prompt = """4 5 6 10"""