json-repair 0.48.0__py3-none-any.whl → 0.50.0__py3-none-any.whl

json_repair/json_parser.py

@@ -155,7 +155,7 @@ class JSONParser:
                 return idx
         return idx
 
-    def skip_to_character(self, character: str, idx: int = 0) -> int:
+    def skip_to_character(self, character: str | list, idx: int = 0) -> int:
         """
         This function quickly iterates to find a character, syntactic sugar to make the code more concise
         """
@@ -163,12 +163,16 @@ class JSONParser:
             char = self.json_str[self.index + idx]
         except IndexError:
             return idx
-        while char != character:
+        character_list = character if isinstance(character, list) else [character]
+        while char not in character_list:
             idx += 1
             try:
                 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/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/parse_string.py

@@ -104,11 +104,17 @@ def parse_string(self: "JSONParser") -> str | bool | None:
     char = self.get_char_at()
     unmatched_delimiter = False
     while char and char != rstring_delimiter:
-        if missing_quotes and self.context.current == ContextValues.OBJECT_KEY and (char == ":" or char.isspace()):
-            self.log(
-                "While parsing a string missing the left delimiter in object key context, we found a :, stopping here",
-            )
-            break
+        if missing_quotes:
+            if self.context.current == ContextValues.OBJECT_KEY and (char == ":" or char.isspace()):
+                self.log(
+                    "While parsing a string missing the left delimiter in object key context, we found a :, stopping here",
+                )
+                break
+            elif self.context.current == ContextValues.ARRAY and char in ["]", ","]:
+                self.log(
+                    "While parsing a string missing the left delimiter in array context, we found a ] or ,, stopping here",
+                )
+                break
         if (
             not self.stream_stable
             and self.context.current == ContextValues.OBJECT_VALUE
@@ -385,16 +391,30 @@ def parse_string(self: "JSONParser") -> str | bool | None:
                             self.index += 1
                             char = self.get_char_at()
                     elif self.context.current == ContextValues.ARRAY:
-                        # If we got up to here it means that this is a situation like this:
-                        # ["bla bla bla "puppy" bla bla bla "kitty" bla bla"]
-                        # So we need to ignore this quote
-                        self.log(
-                            "While parsing a string in Array context, we detected a quoted section that would have closed the string but has a different meaning here, ignoring it",
-                        )
-                        unmatched_delimiter = not unmatched_delimiter
-                        string_acc += str(char)
-                        self.index += 1
-                        char = self.get_char_at()
+                        # Let's check if after this quote there are two quotes in a row followed by a comma or a closing bracket
+                        i = self.skip_to_character(character=[rstring_delimiter, "]"], idx=i + 1)
+                        next_c = self.get_char_at(i)
+                        even_delimiters = next_c and next_c == rstring_delimiter
+                        while even_delimiters and next_c and next_c == rstring_delimiter:
+                            i = self.skip_to_character(character=[rstring_delimiter, "]"], idx=i + 1)
+                            i = self.skip_to_character(character=[rstring_delimiter, "]"], idx=i + 1)
+                            next_c = self.get_char_at(i)
+                        # i = self.skip_whitespaces_at(idx=i + 1, move_main_index=False)
+                        # next_c = self.get_char_at(i)
+                        # if next_c in [",", "]"]:
+                        if even_delimiters and next_c != "]":
+                            # If we got up to here it means that this is a situation like this:
+                            # ["bla bla bla "puppy" bla bla bla "kitty" bla bla"]
+                            # So we need to ignore this quote
+                            self.log(
+                                "While parsing a string in Array context, we detected a quoted section that would have closed the string but has a different meaning here, ignoring it",
+                            )
+                            unmatched_delimiter = not unmatched_delimiter
+                            string_acc += str(char)
+                            self.index += 1
+                            char = self.get_char_at()
+                        else:
+                            break
                     elif self.context.current == ContextValues.OBJECT_KEY:
                         # In this case we just ignore this and move on
                         self.log(

{json_repair-0.48.0.dist-info → json_repair-0.50.0.dist-info}/METADATA

@@ -1,36 +1,14 @@
 Metadata-Version: 2.4
 Name: json_repair
-Version: 0.48.0
+Version: 0.50.0
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
-License: MIT License
-        
-        Copyright (c) 2023 Stefano Baccianella
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/mangiucugna/json_repair/
 Project-URL: Bug Tracker, https://github.com/mangiucugna/json_repair/issues
 Project-URL: Live demo, https://mangiucugna.github.io/json_repair/
 Keywords: JSON,REPAIR,LLM,PARSER
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -39,7 +17,8 @@ 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/month)](https://pepy.tech/projects/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)
 
@@ -69,11 +48,6 @@ I searched for a lightweight python package that was able to reliably fix this p
 
 *So I wrote one*
 
-### Wouldn't GPT-4o Structured Output make this library outdated?
-
-As part of my job we use OpenAI APIs and we noticed that even with structured output sometimes the result isn't a fully valid json.
-So we still use this library to cover those outliers.
-
 # Supported use cases
 
 ### Fixing Syntax Errors in JSON

{json_repair-0.48.0.dist-info → json_repair-0.50.0.dist-info}/RECORD

@@ -2,20 +2,20 @@ json_repair/__init__.py,sha256=JdJIZNCKV3MfIviryqK8NH8yGssCta2-192CekcwH-o,174
 json_repair/__main__.py,sha256=EsJb-y89uZEvGQQg1GdIDWzfDwfOMvVekKEtdguQXCM,67
 json_repair/constants.py,sha256=cv2gvyosuq0me0600WyTysM9avrtfXPuXYR26tawcuo,158
 json_repair/json_context.py,sha256=WsMOjqpGSr6aaDONcrk8UFtTurzWon2Qq9AoBBYseoI,934
-json_repair/json_parser.py,sha256=rTuL8ESslQ4XK9fkLmBIpS4e8xr6QwlZRVyJwzJFqBE,7356
-json_repair/json_repair.py,sha256=txblCJtcTpXcQaT15tavulkJPtyRYe2cfYpPHZcvPv0,11233
+json_repair/json_parser.py,sha256=glod61Zc6HtVxwvGxBwbz8WEU0BB5LkNZXLw4Z956yI,7632
+json_repair/json_repair.py,sha256=sDhXzDZxu0QmaFzICPTtf_q7yOY1A1Lf_iQG6Potsco,11572
 json_repair/object_comparer.py,sha256=XKV3MRab8H7_v4sm-wpEa5le0XX9OeycWo5S-MFm-GI,1716
 json_repair/parse_array.py,sha256=-rh65JcfT-FtXiR6s8RYlMfI-6LzVr08ytlDh6Z2CFE,2181
 json_repair/parse_boolean_or_null.py,sha256=WMSkvvxsp4wvauBcDqtt9WnLMD5SMoxeRfZFXp3FEBc,890
 json_repair/parse_comment.py,sha256=JHtQ_QlxOvPNnMh7lhUaoTjFGelqjhTNq7qn9xUE7SU,2648
 json_repair/parse_number.py,sha256=33zAtkbuVzi9Lqjxu7cXn9WlVzd3WjRx9Ln_LFzVL4o,1259
 json_repair/parse_object.py,sha256=UzkY0C5NSE2CtVnZwugMyhhtUJPgs0MwBb4kF4l2ftU,4563
-json_repair/parse_string.py,sha256=Ju1txvEWrOQnncigBOnlkEdVwXYGz4jaKr9QOpjAx5o,22947
+json_repair/parse_string.py,sha256=FTTlgfjXcR2N4Et_f2qBhqXvfEps_L0oznp_ORup1_A,24323
 json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 json_repair/string_file_wrapper.py,sha256=tGkWBEUPE-CZPf4uSM5NE9oSDTpskX0myJiXsl-gbds,4333
-json_repair-0.48.0.dist-info/licenses/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.48.0.dist-info/METADATA,sha256=--ltEVHVgM9Jh9wxa--Ad22rM34kXNO5faj1oHtBIO8,12411
-json_repair-0.48.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-json_repair-0.48.0.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
-json_repair-0.48.0.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.48.0.dist-info/RECORD,,
+json_repair-0.50.0.dist-info/licenses/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
+json_repair-0.50.0.dist-info/METADATA,sha256=_90s7Q5c2SSf--pfiykcfjLXdDZqBTjGU269JXj1uPI,10987
+json_repair-0.50.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+json_repair-0.50.0.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
+json_repair-0.50.0.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
+json_repair-0.50.0.dist-info/RECORD,,