Skip to content

Commit

Permalink
Fallback to json5 loader if json.loads cannot parse complex json str
Browse files Browse the repository at this point in the history
JSON5 spec is more flexible, try to load using a fast json5 parser if
the stricter json.loads from the standard library can't load the
raw complex json string into a python dictionary/list
  • Loading branch information
debanjum committed Nov 27, 2024
1 parent 70b7e7c commit 8c120a5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ dependencies = [
"anthropic == 0.26.1",
"docx2txt == 0.8",
"google-generativeai == 0.8.3",
"pyjson5 == 1.6.7",
]
dynamic = ["version"]

Expand Down
12 changes: 7 additions & 5 deletions src/khoj/processor/conversation/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from typing import Any, Callable, Dict, List, Optional

import PIL.Image
import pyjson5
import requests
import tiktoken
import yaml
Expand Down Expand Up @@ -565,17 +566,18 @@ def replace_unescaped_quotes(match):
processed = re.sub(pattern, replace_unescaped_quotes, cleaned)

# See which json loader can load the processed JSON as valid
errors = ""
json_loaders_to_try = [json.loads]
errors = []
json_loaders_to_try = [json.loads, pyjson5.loads]
for loads in json_loaders_to_try:
try:
return loads(processed)
except json.JSONDecodeError as e:
errors += f"\n\n{e}"
except (json.JSONDecodeError, pyjson5.Json5Exception) as e:
errors.append(f"{type(e).__name__}: {str(e)}")

# If all loaders fail, raise the aggregated error
raise ValueError(
f"Failed to load JSON with error: {errors}\n\nWhile attempting to load this cleaned JSON:\n{processed}"
f"Failed to load JSON with errors: {'; '.join(errors)}\n\n"
f"While attempting to load this cleaned JSON:\n{processed}"
)


Expand Down

0 comments on commit 8c120a5

Please sign in to comment.