Added json fix in factool and factcheckgpt

src/openfactcheck/solvers/webservice/factcheckgpt_utils/openai_api.py

@@ -6,21 +6,25 @@ import openai
 client = None
 
 
+def _json_fix(output):
+    return output.replace("```json\n", "").replace("```", "")
+
+
 def init_client():
     global client
     if client is None:
-        if openai.api_key is None and 'OPENAI_API_KEY' not in os.environ:
+        if openai.api_key is None and "OPENAI_API_KEY" not in os.environ:
             print("openai_key not presented, delay to initialize.")
             return
         client = OpenAI()
 
 
 def request(
-        user_inputs,
-        model,
-        system_role,
-        temperature=1.0,
-        return_all=False,
+    user_inputs,
+    model,
+    system_role,
+    temperature=1.0,
+    return_all=False,
 ):
     init_client()
 
@@ -29,9 +33,7 @@ def request(
     elif type(user_inputs) == list:
         if all([type(x) == str for x in user_inputs]):
             chat_histories = [
-                {
-                    "role": "user" if i % 2 == 0 else "assistant", "content": x
-                } for i, x in enumerate(user_inputs)
+                {"role": "user" if i % 2 == 0 else "assistant", "content": x} for i, x in enumerate(user_inputs)
             ]
         elif all([type(x) == dict for x in user_inputs]):
             chat_histories = user_inputs
@@ -39,31 +41,23 @@ def request(
             raise ValueError("Invalid input for OpenAI API calling")
     else:
         raise ValueError("Invalid input for OpenAI API calling")
-    
 
     messages = [{"role": "system", "content": system_role}] + chat_histories
 
-    response = client.chat.completions.create(
-        model=model,
-        messages=messages,
-        temperature=temperature
-    )
+    response = client.chat.completions.create(model=model, messages=messages, temperature=temperature)
+
+    # Fix the json format
+    response = _json_fix(response)
+
     if return_all:
         return response
-    response_str = ''
+    response_str = ""
     for choice in response.choices:
         response_str += choice.message.content
     return response_str
 
 
-def gpt(
-        user_inputs,
-        model,
-        system_role,
-        temperature=1.0,
-        num_retries=3,
-        waiting=1
-):
+def gpt(user_inputs, model, system_role, temperature=1.0, num_retries=3, waiting=1):
     response = None
     for _ in range(num_retries):
         try:

src/openfactcheck/solvers/webservice/factool_utils/chat_api.py

@@ -72,6 +72,9 @@ class OpenAIChat:
         else:
             return None
 
+    def _json_fix(self, output):
+        return output.replace("```json\n", "").replace("```", "")
+
     def _boolean_fix(self, output):
         return output.replace("true", "True").replace("false", "False")
 
@@ -166,7 +169,9 @@ class OpenAIChat:
             )
 
             preds = [
-                self._type_check(self._boolean_fix(prediction.choices[0].message.content), expected_type)
+                self._type_check(
+                    self._boolean_fix(self._json_fix(prediction.choices[0].message.content)), expected_type
+                )
                 if prediction is not None
                 else None
                 for prediction in predictions