Generate questions endpoints working for all.

helper/openai_interface.py

@@ -23,15 +23,24 @@ def process_response(input_string, quotation_check_field):
             index = input_string.index('{')
             # Extract everything after the first '{' (inclusive)
             result = input_string[index:]
-            if re.search(r"'" + quotation_check_field + "':\s*'(.*?)'", result, re.DOTALL | re.MULTILINE):
+            if re.search(r"'" + quotation_check_field + "':\s*'(.*?)'", result, re.DOTALL | re.MULTILINE) or \
+                    re.search(r"'" + quotation_check_field + "':\s*\[([^\]]+)]", result, re.DOTALL | re.MULTILINE):
                 json_obj = json.loads(parse_string(result))
                 return json_obj
             else:
                 parsed_string = result.replace("\n\n", " ")
-                json_obj = json.loads(parsed_string)
-                return json_obj
+                parsed_string = parsed_string.replace("\n", " ")
+                parsed_string = re.sub(r',\s*]', ']', parsed_string)
+                parsed_string = re.sub(r',\s*}', '}', parsed_string)
+                if (parsed_string.find('[') == -1) and (parsed_string.find(']') == -1):
+                    parsed_string = parse_string_2(parsed_string)
+                    return json.loads(parsed_string)
+
+                return json.loads(parsed_string)
         except Exception as e:
             print(f"Invalid JSON string! Exception: {e}")
+            print(f"String: {input_string}")
+            print(f"Exception: {e}")
     else:
         return input_string
 
@@ -41,9 +50,36 @@ def parse_string(to_parse: str):
     parsed_string = re.sub(pattern, '"', parsed_string)
     parsed_string = parsed_string.replace("\\\"", "'")
     parsed_string = parsed_string.replace("\n\n", " ")
+    parsed_string = re.sub(r',\s*]', ']', parsed_string)
+    parsed_string = re.sub(r',\s*}', '}', parsed_string)
     return parsed_string
 
 
+def parse_string_2(to_parse: str):
+    keys_and_values_str = to_parse.replace("{", "").replace("}", "")
+    split_pattern = r'(?<="),|(?<="):'
+    keys_and_values = re.split(split_pattern, keys_and_values_str)
+
+    keys = []
+    values = []
+
+    for idx, x in enumerate(keys_and_values):
+        if (idx % 2) == 0:
+            keys.append(x)
+        else:
+            values.append(x)
+
+    parsed_values = []
+
+    for value in values:
+        parsed_values.append(("\"" + value.replace("\"", "").strip() + "\""))
+
+    for ind, parsed_value in enumerate(parsed_values):
+        to_parse = to_parse.replace(values[ind], parsed_values[ind])
+
+    to_parse = to_parse.replace(":", ": ")
+    return to_parse
+
 def remove_special_chars_and_escapes(input_string):
     parsed_string = input_string.replace("\\\"", "'")
     parsed_string = parsed_string.replace("\n\n", " ")
@@ -96,16 +132,12 @@ def make_openai_instruct_call(model, message: str, token_count, fields_to_check,
     )["choices"][0]["text"]
 
     if fields_to_check is None:
-        return remove_special_chars_and_escapes(response)
+        return response
 
     processed_response = process_response(response, fields_to_check[0])
-
     if check_fields(processed_response, fields_to_check) is False and try_count < TRY_LIMIT:
         try_count = try_count + 1
         return make_openai_instruct_call(model, message, token_count, fields_to_check, temperature)
-    elif try_count >= TRY_LIMIT:
-        try_count = 0
-        return remove_special_chars_and_escapes(response)
     else:
         try_count = 0
         return processed_response