json-repair 0.47.8__tar.gz → 0.49.0__tar.gz

{json_repair-0.47.8/src/json_repair.egg-info → json_repair-0.49.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_repair
-Version: 0.47.8
+Version: 0.49.0
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License
@@ -40,6 +40,7 @@ Dynamic: license-file
 [![PyPI](https://img.shields.io/pypi/v/json-repair)](https://pypi.org/project/json-repair/)
 ![Python version](https://img.shields.io/badge/python-3.10+-important)
 [![PyPI downloads](https://img.shields.io/pypi/dm/json-repair)](https://pypi.org/project/json-repair/)
+[![PyPI Downloads](https://static.pepy.tech/badge/json-repair)](https://pepy.tech/projects/json-repair)
 [![Github Sponsors](https://img.shields.io/github/sponsors/mangiucugna)](https://github.com/sponsors/mangiucugna)
 [![GitHub Repo stars](https://img.shields.io/github/stars/mangiucugna/json_repair?style=flat)](https://github.com/mangiucugna/json_repair/stargazers)
 

{json_repair-0.47.8 → json_repair-0.49.0}/README.md

@@ -1,6 +1,7 @@
 [![PyPI](https://img.shields.io/pypi/v/json-repair)](https://pypi.org/project/json-repair/)
 ![Python version](https://img.shields.io/badge/python-3.10+-important)
 [![PyPI downloads](https://img.shields.io/pypi/dm/json-repair)](https://pypi.org/project/json-repair/)
+[![PyPI Downloads](https://static.pepy.tech/badge/json-repair)](https://pepy.tech/projects/json-repair)
 [![Github Sponsors](https://img.shields.io/github/sponsors/mangiucugna)](https://github.com/sponsors/mangiucugna)
 [![GitHub Repo stars](https://img.shields.io/github/stars/mangiucugna/json_repair?style=flat)](https://github.com/mangiucugna/json_repair/stargazers)
 

{json_repair-0.47.8 → json_repair-0.49.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "json_repair"
-version = "0.47.8"
+version = "0.49.0"
 license = {file = "LICENSE"}
 authors = [
   { name="Stefano Baccianella", email="4247706+mangiucugna@users.noreply.github.com" },

{json_repair-0.47.8 → json_repair-0.49.0}/src/json_repair/json_parser.py

@@ -169,6 +169,9 @@ class JSONParser:
                 char = self.json_str[self.index + idx]
             except IndexError:
                 return idx
+        if self.json_str[self.index + idx - 1] == "\\":
+            # Ah shoot this was actually escaped, continue
+            return self.skip_to_character(character, idx + 1)
         return idx
 
     def _log(self, text: str) -> None:

{json_repair-0.47.8 → json_repair-0.49.0}/src/json_repair/json_repair.py

@@ -66,7 +66,7 @@ def repair_json(
     chunk_length: int = 0,
     stream_stable: bool = False,
     **json_dumps_args,
-) -> JSONReturnType | tuple[JSONReturnType, list[dict[str, str]]]:
+) -> JSONReturnType | tuple[JSONReturnType, list[dict[str, str]]] | tuple[JSONReturnType, list]:
     """
     Given a json formatted string, it will try to decode it and, if it fails, it will try to fix it.
 
@@ -74,13 +74,13 @@ def repair_json(
         json_str (str, optional): The JSON string to repair. Defaults to an empty string.
         return_objects (bool, optional): If True, return the decoded data structure. Defaults to False.
         skip_json_loads (bool, optional): If True, skip calling the built-in json.loads() function to verify that the json is valid before attempting to repair. Defaults to False.
-        logging (bool, optional): If True, return a tuple with the repaired json and a log of all repair actions. Defaults to False.
+        logging (bool, optional): If True, return a tuple with the repaired json and a log of all repair actions. Defaults to False. When no repairs were required, the repair log will be an empty list.
         json_fd (Optional[TextIO], optional): File descriptor for JSON input. Do not use! Use `from_file` or `load` instead. Defaults to None.
         ensure_ascii (bool, optional): Set to False to avoid converting non-latin characters to ascii (for example when using chinese characters). Defaults to True. Ignored if `skip_json_loads` is True.
         chunk_length (int, optional): Size in bytes of the file chunks to read at once. Ignored if `json_fd` is None. Do not use! Use `from_file` or `load` instead. Defaults to 1MB.
         stream_stable (bool, optional): When the json to be repaired is the accumulation of streaming json at a certain moment.If this parameter to True will keep the repair results stable.
     Returns:
-        Union[JSONReturnType, Tuple[JSONReturnType, List[Dict[str, str]]]]: The repaired JSON or a tuple with the repaired JSON and repair log.
+        Union[JSONReturnType, Tuple[JSONReturnType, List[Dict[str, str]]]]: The repaired JSON or a tuple with the repaired JSON and repair log when logging is True.
     """
     parser = JSONParser(json_str, json_fd, logging, chunk_length, stream_stable)
     if skip_json_loads:
@@ -93,6 +93,10 @@ def repair_json(
     # It's useful to return the actual object instead of the json string,
     # it allows this lib to be a replacement of the json library
     if return_objects or logging:
+        # If logging is True, the user should expect a tuple.
+        # If json.load(s) worked, the repair log list is empty
+        if logging and not isinstance(parsed_json, tuple):
+            return parsed_json, []
         return parsed_json
     # Avoid returning only a pair of quotes if it's an empty string
     elif parsed_json == "":

{json_repair-0.47.8 → json_repair-0.49.0}/src/json_repair/parse_string.py

@@ -213,8 +213,7 @@ def parse_string(self: "JSONParser") -> str | bool | None:
                 while char and string_acc[-1] == "\\" and char in [rstring_delimiter, "\\"]:
                     # this is a bit of a special case, if I don't do this it will close the loop or create a train of \\
                     # I don't love it though
-                    string_acc = string_acc[:-1]
-                    string_acc += char
+                    string_acc = string_acc[:-1] + char
                     self.index += 1
                     char = self.get_char_at()
                 continue
@@ -224,11 +223,16 @@ def parse_string(self: "JSONParser") -> str | bool | None:
                 next_chars = self.json_str[self.index + 1 : self.index + 1 + num_chars]
                 if len(next_chars) == num_chars and all(c in "0123456789abcdefABCDEF" for c in next_chars):
                     self.log("Found a unicode escape sequence, normalizing it")
-                    string_acc = string_acc[:-1]
-                    string_acc += chr(int(next_chars, 16))
+                    string_acc = string_acc[:-1] + chr(int(next_chars, 16))
                     self.index += 1 + num_chars
                     char = self.get_char_at()
                     continue
+            elif char in STRING_DELIMITERS and char != rstring_delimiter:
+                self.log("Found a delimiter that was escaped but shouldn't be escaped, removing the escape")
+                string_acc = string_acc[:-1] + char
+                self.index += 1
+                char = self.get_char_at()
+                continue
         # If we are in object key context and we find a colon, it could be a missing right quote
         if char == ":" and not missing_quotes and self.context.current == ContextValues.OBJECT_KEY:
             # Ok now we need to check if this is followed by a value like "..."

{json_repair-0.47.8 → json_repair-0.49.0/src/json_repair.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_repair
-Version: 0.47.8
+Version: 0.49.0
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License
@@ -40,6 +40,7 @@ Dynamic: license-file
 [![PyPI](https://img.shields.io/pypi/v/json-repair)](https://pypi.org/project/json-repair/)
 ![Python version](https://img.shields.io/badge/python-3.10+-important)
 [![PyPI downloads](https://img.shields.io/pypi/dm/json-repair)](https://pypi.org/project/json-repair/)
+[![PyPI Downloads](https://static.pepy.tech/badge/json-repair)](https://pepy.tech/projects/json-repair)
 [![Github Sponsors](https://img.shields.io/github/sponsors/mangiucugna)](https://github.com/sponsors/mangiucugna)
 [![GitHub Repo stars](https://img.shields.io/github/stars/mangiucugna/json_repair?style=flat)](https://github.com/mangiucugna/json_repair/stargazers)
 

{json_repair-0.47.8 → json_repair-0.49.0}/tests/test_json_repair.py

@@ -158,3 +158,22 @@ def test_stream_stable():
     assert repair_json('{"key": "val\\n', stream_stable=True) == '{"key": "val\\n"}'
     assert repair_json('{"key": "val\\n123,`key2:value2', stream_stable=True) == '{"key": "val\\n123,`key2:value2"}'
     assert repair_json('{"key": "val\\n123,`key2:value2`"}', stream_stable=True) == '{"key": "val\\n123,`key2:value2`"}'
+
+
+def test_logging():
+    assert repair_json("{}", logging=True) == ({}, [])
+    assert repair_json('{"key": "value}', logging=True) == (
+        {"key": "value"},
+        [
+            {
+                "context": 'y": "value}',
+                "text": "While parsing a string missing the left delimiter in object value "
+                "context, we found a , or } and we couldn't determine that a right "
+                "delimiter was present. Stopping here",
+            },
+            {
+                "context": 'y": "value}',
+                "text": "While parsing a string, we missed the closing quote, ignoring",
+            },
+        ],
+    )

{json_repair-0.47.8 → json_repair-0.49.0}/tests/test_parse_string.py

@@ -72,6 +72,8 @@ def test_escaping():
     assert repair_json('{"key\t_": "value"}') == '{"key\\t_": "value"}'
     assert repair_json("{\"key\": '\u0076\u0061\u006c\u0075\u0065'}") == '{"key": "value"}'
     assert repair_json('{"key": "\\u0076\\u0061\\u006C\\u0075\\u0065"}', skip_json_loads=True) == '{"key": "value"}'
+    assert repair_json("""{"key": "valu\\'e"}""") == """{"key": "valu'e"}"""
+    assert repair_json('{\'key\': "{\\"key\\": 1, \\"key2\\": 1}"}') == '{"key": "{\\"key\\": 1, \\"key2\\": 1}"}'
 
 
 def test_markdown():