autogpt 还原，开新分支编写

autogpt/json_utils/json_fix_general.py

@@ -9,7 +9,6 @@ from typing import Optional
 
 from autogpt.config import Config
 from autogpt.json_utils.utilities import extract_char_position
-from autogpt.logs import logger
 
 CFG = Config()
 
@@ -34,7 +33,8 @@ def fix_invalid_escape(json_to_load: str, error_message: str) -> str:
             json.loads(json_to_load)
             return json_to_load
         except json.JSONDecodeError as e:
-            logger.debug("json loads error - fix invalid escape", e)
+            if CFG.debug_mode:
+                print("json loads error - fix invalid escape", e)
             error_message = str(e)
     return json_to_load
 
@@ -98,11 +98,13 @@ def correct_json(json_to_load: str) -> str:
     """
 
     try:
-        logger.debug("json", json_to_load)
+        if CFG.debug_mode:
+            print("json", json_to_load)
         json.loads(json_to_load)
         return json_to_load
     except json.JSONDecodeError as e:
-        logger.debug("json loads error", e)
+        if CFG.debug_mode:
+            print("json loads error", e)
         error_message = str(e)
         if error_message.startswith("Invalid \\escape"):
             json_to_load = fix_invalid_escape(json_to_load, error_message)
@@ -114,7 +116,8 @@ def correct_json(json_to_load: str) -> str:
                 json.loads(json_to_load)
                 return json_to_load
             except json.JSONDecodeError as e:
-                logger.debug("json loads error - add quotes", e)
+                if CFG.debug_mode:
+                    print("json loads error - add quotes", e)
                 error_message = str(e)
         if balanced_str := balance_braces(json_to_load):
             return balanced_str

autogpt/json_utils/json_fix_llm.py

@@ -11,7 +11,7 @@ from regex import regex
 
 from autogpt.config import Config
 from autogpt.json_utils.json_fix_general import correct_json
-from autogpt.llm.utils import call_ai_function
+from autogpt.llm_utils import call_ai_function
 from autogpt.logs import logger
 from autogpt.speech import say_text
 
@@ -91,33 +91,14 @@ def fix_json_using_multiple_techniques(assistant_reply: str) -> Dict[Any, Any]:
     Returns:
         str: The fixed JSON string.
     """
-    assistant_reply = assistant_reply.strip()
-    if assistant_reply.startswith("```json"):
-        assistant_reply = assistant_reply[7:]
-    if assistant_reply.endswith("```"):
-        assistant_reply = assistant_reply[:-3]
-    try:
-        return json.loads(assistant_reply)  # just check the validity
-    except json.JSONDecodeError:  # noqa: E722
-        pass
-
-    if assistant_reply.startswith("json "):
-        assistant_reply = assistant_reply[5:]
-        assistant_reply = assistant_reply.strip()
-    try:
-        return json.loads(assistant_reply)  # just check the validity
-    except json.JSONDecodeError:  # noqa: E722
-        pass
 
     # Parse and print Assistant response
     assistant_reply_json = fix_and_parse_json(assistant_reply)
-    logger.debug("Assistant reply JSON: %s", str(assistant_reply_json))
     if assistant_reply_json == {}:
         assistant_reply_json = attempt_to_fix_json_by_finding_outermost_brackets(
             assistant_reply
         )
 
-    logger.debug("Assistant reply JSON 2: %s", str(assistant_reply_json))
     if assistant_reply_json != {}:
         return assistant_reply_json
 

autogpt/json_utils/utilities.py

@@ -1,6 +1,5 @@
 """Utilities for the json_fixes package."""
 import json
-import os.path
 import re
 
 from jsonschema import Draft7Validator
@@ -9,7 +8,6 @@ from autogpt.config import Config
 from autogpt.logs import logger
 
 CFG = Config()
-LLM_DEFAULT_RESPONSE_FORMAT = "llm_response_format_1"
 
 
 def extract_char_position(error_message: str) -> int:
@@ -30,15 +28,13 @@ def extract_char_position(error_message: str) -> int:
         raise ValueError("Character position not found in the error message.")
 
 
-def validate_json(json_object: object, schema_name: str):
+def validate_json(json_object: object, schema_name: object) -> object:
     """
     :type schema_name: object
-    :param schema_name: str
+    :param schema_name:
     :type json_object: object
     """
-    # with open(f"/Users/kilig/Job/Python-project/auto-gpt/autogpt/json_utils/{schema_name}.json", "r") as f:
-    scheme_file = os.path.join(os.path.dirname(__file__), f"{schema_name}.json")
-    with open(scheme_file, "r") as f:
+    with open(f"/Users/kilig/Job/Python-project/academic_gpt/autogpt/json_utils/{schema_name}.json", "r") as f:
         schema = json.load(f)
     validator = Draft7Validator(schema)
 
@@ -52,31 +48,7 @@ def validate_json(json_object: object, schema_name: str):
 
             for error in errors:
                 logger.error(f"Error: {error.message}")
-    else:
-        logger.debug("The JSON object is valid.")
+    elif CFG.debug_mode:
+        print("The JSON object is valid.")
 
     return json_object
-
-
-def validate_json_string(json_string: str, schema_name: str):
-    """
-    :type schema_name: object
-    :param schema_name: str
-    :type json_object: object
-    """
-
-    try:
-        json_loaded = json.loads(json_string)
-        return validate_json(json_loaded, schema_name)
-    except:
-        return None
-
-
-def is_string_valid_json(json_string: str, schema_name: str) -> bool:
-    """
-    :type schema_name: object
-    :param schema_name: str
-    :type json_object: object
-    """
-
-    return validate_json_string(json_string, schema_name) is not None