From d1deb0ff7ccaa9d4f74eeb632b579cd080944c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=A3=92=E6=A3=92?= <liubangbang@fuzhi.ai>
Date: Sun, 4 Feb 2024 18:03:27 +0800
Subject: [PATCH] Remove _parse_arguments function and comment out
 handle_exception decorator on get_choice_function_arguments.

---
 metagpt/provider/openai_api.py | 41 +++++-----------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/metagpt/provider/openai_api.py b/metagpt/provider/openai_api.py
index 206701efd..3ab25c276 100644
--- a/metagpt/provider/openai_api.py
+++ b/metagpt/provider/openai_api.py
@@ -8,7 +8,6 @@
 """
 
 import json
-import re
 from typing import AsyncIterator, Optional, Union
 
 from openai import APIConnectionError, AsyncOpenAI, AsyncStream
@@ -195,31 +194,7 @@ class OpenAILLM(BaseLLM):
         rsp = await self._achat_completion_function(messages, **kwargs)
         return self.get_choice_function_arguments(rsp)
 
-    def _parse_arguments(self, arguments: str) -> dict:
-        """parse arguments in openai function call"""
-        if "langugae" not in arguments and "code" not in arguments:
-            logger.warning(f"Not found `code`, `language`, We assume it is pure code:\n {arguments}\n. ")
-            return {"language": "python", "code": arguments}
-
-        # 匹配language
-        language_pattern = re.compile(r'[\"\']?language[\"\']?\s*:\s*["\']([^"\']+?)["\']', re.DOTALL)
-        language_match = language_pattern.search(arguments)
-        language_value = language_match.group(1) if language_match else "python"
-
-        # 匹配code
-        code_pattern = r'(["\'`]{3}|["\'`])([\s\S]*?)\1'
-        try:
-            code_value = re.findall(code_pattern, arguments)[-1][-1]
-        except Exception as e:
-            logger.error(f"{e}, when re.findall({code_pattern}, {arguments})")
-            code_value = None
-
-        if code_value is None:
-            raise ValueError(f"Parse code error for {arguments}")
-        # arguments只有code的情况
-        return {"language": language_value, "code": code_value}
-
-    @handle_exception
+    # @handle_exception
     def get_choice_function_arguments(self, rsp: ChatCompletion) -> dict:
         """Required to provide the first function arguments of choice.
 
@@ -237,19 +212,15 @@ class OpenAILLM(BaseLLM):
             try:
                 return json.loads(message.tool_calls[0].function.arguments, strict=False)
             except json.decoder.JSONDecodeError as e:
-                logger.warning(
-                    "\n".join(
-                        [
-                            (f"Got JSONDecodeError for \n{'--'*40} \n{message.tool_calls[0].function.arguments}"),
-                            (f"{'--'*40}\nwe will use RegExp to parse code. JSONDecodeError is: {e}"),
-                        ]
-                    )
+                error_msg = (
+                    f"Got JSONDecodeError for \n{'--'*40} \n{message.tool_calls[0].function.arguments}, {str(e)}"
                 )
-                return self._parse_arguments(message.tool_calls[0].function.arguments)
+                logger.error(error_msg)
+                raise json.decoder.JSONDecodeError(error_msg, e.doc, e.pos)
         elif message.tool_calls is None and message.content is not None:
             # reponse is code, fix openai tools_call respond bug,
             # The response content is `code``, but it appears in the content instead of the arguments.
-            code_formats = ("```", '"""', "'''")
+            code_formats = "```"
             if message.content.startswith(code_formats) and message.content.endswith(code_formats):
                 code = CodeParser.parse_code(None, message.content)
                 return {"language": "python", "code": code}