Merge branch 'main' into add_azure_engine

metagpt/provider/anthropic_api.py

@@ -32,3 +32,4 @@ class Claude2:
             max_tokens_to_sample=1000,
         )
         return res.completion
+    

metagpt/provider/base_chatbot.py

@@ -25,3 +25,4 @@ class BaseChatbot(ABC):
     @abstractmethod
     def ask_code(self, msgs: list) -> str:
         """Ask GPT multiple questions and get a piece of code"""
+        

metagpt/provider/base_gpt_api.py

@@ -115,3 +115,4 @@ class BaseGPTAPI(BaseChatbot):
     def messages_to_dict(self, messages):
         """objects to [{"role": "user", "content": msg}] etc."""
         return [i.to_dict() for i in messages]
+    

metagpt/provider/openai_api.py

@@ -48,14 +48,12 @@ class RateLimiter:
 
         self.last_call_time = time.time()
 
-
 class Costs(NamedTuple):
     total_prompt_tokens: int
     total_completion_tokens: int
     total_cost: float
     total_budget: float
 
-
 class CostManager(metaclass=Singleton):
     """计算使用接口的开销"""
 
@@ -102,18 +100,26 @@ class CostManager(metaclass=Singleton):
         """
         return self.total_completion_tokens
 
-    def get_total_cost(self):
-        """
-        Get the total cost of API calls.
+def get_total_cost(self):
+    """
+    Get the total cost of API calls.
 
-        Returns:
-        float: The total cost of API calls.
-        """
-        return self.total_cost
+    Returns:
+    float: The total cost of API calls.
+    """
+    return self.total_cost
 
-    def get_costs(self) -> Costs:
-        """获得所有开销"""
-        return Costs(self.total_prompt_tokens, self.total_completion_tokens, self.total_cost, self.total_budget)
+def get_costs(self) -> Costs:
+    """Get all costs"""
+    return Costs(self.total_prompt_tokens, self.total_completion_tokens, self.total_cost, self.total_budget)
+
+def log_and_reraise(retry_state):
+    logger.error(f"Retry attempts exhausted. Last exception: {retry_state.outcome.exception()}")
+    logger.warning("""
+Recommend going to https://deepwisdom.feishu.cn/wiki/MsGnwQBjiif9c3koSJNcYaoSnu4#part-XdatdVlhEojeAfxaaEZcMV3ZniQ
+See FAQ 5.8
+""")
+    raise retry_state.outcome.exception()
 
 
 def log_and_reraise(retry_state):
@@ -241,7 +247,7 @@ class OpenAIGPTAPI(BaseGPTAPI, RateLimiter):
             return usage
 
     async def acompletion_batch(self, batch: list[list[dict]]) -> list[dict]:
-        """返回完整JSON"""
+        """Return full JSON"""
         split_batches = self.split_batches(batch)
         all_results = []
 
@@ -257,7 +263,7 @@ class OpenAIGPTAPI(BaseGPTAPI, RateLimiter):
         return all_results
 
     async def acompletion_batch_text(self, batch: list[list[dict]]) -> list[str]:
-        """仅返回纯文本"""
+        """Only return plain text"""
         raw_results = await self.acompletion_batch(batch)
         results = []
         for idx, raw_result in enumerate(raw_results, start=1):