json-repair 0.27.1__tar.gz → 0.28.0__tar.gz

{json_repair-0.27.1/src/json_repair.egg-info → json_repair-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.27.1
+Version: 0.28.0
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License
@@ -27,6 +27,7 @@ License: MIT License
         
 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
@@ -38,7 +39,7 @@ License-File: LICENSE
 [![PyPI](https://img.shields.io/pypi/v/json-repair)](https://pypi.org/project/json-repair/)
 ![Python version](https://img.shields.io/badge/python-3.8+-important)
 [![PyPI downloads](https://img.shields.io/pypi/dm/json-repair)](https://pypi.org/project/json-repair/)
-
+[![Github Sponsors](https://img.shields.io/github/sponsors/mangiucugna)](https://github.com/sponsors/mangiucugna)
 
 This simple package can be used to fix an invalid json string. To know all cases in which this package will work, check out the unit test.
 

{json_repair-0.27.1 → json_repair-0.28.0}/README.md

@@ -1,7 +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.8+-important)
 [![PyPI downloads](https://img.shields.io/pypi/dm/json-repair)](https://pypi.org/project/json-repair/)
-
+[![Github Sponsors](https://img.shields.io/github/sponsors/mangiucugna)](https://github.com/sponsors/mangiucugna)
 
 This simple package can be used to fix an invalid json string. To know all cases in which this package will work, check out the unit test.
 

{json_repair-0.27.1 → json_repair-0.28.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "json_repair"
-version = "0.27.1"
+version = "0.28.0"
 license = {file = "LICENSE"}
 authors = [
   { name="Stefano Baccianella", email="4247706+mangiucugna@users.noreply.github.com" },
@@ -17,11 +17,15 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
-
 [project.urls]
 "Homepage" = "https://github.com/mangiucugna/json_repair/"
 "Bug Tracker" = "https://github.com/mangiucugna/json_repair/issues"
+"Live demo" = "https://mangiucugna.github.io/json_repair/"
 [tool.pytest.ini_options]
 pythonpath = [
   "."
 ]
+[tool.setuptools.package-data]
+"pkgname" = ["py.typed"]
+[tool.setuptools.packages.find]
+where = ["src"]

{json_repair-0.27.1 → json_repair-0.28.0}/src/json_repair/json_repair.py

@@ -51,9 +51,6 @@ class StringFileWrapper:
             self.fd.seek(current_position)
         return self.length
 
-    def __setitem__(self) -> None:
-        raise Exception("This is read-only!")
-
 
 class LoggerConfig:
     # This is a type class to simplify the declaration
@@ -179,21 +176,12 @@ class JSONParser:
 
             # <member> starts with a <string>
             key = ""
-            while key == "" and self.get_char_at():
-                current_index = self.index
+            while self.get_char_at():
                 key = self.parse_string()
 
-                # This can happen sometimes like { "": "value" }
-                if key == "" and self.get_char_at() == ":":
-                    key = "empty_placeholder"
-                    self.log(
-                        "While parsing an object we found an empty key, replacing with empty_placeholder",
-                        "info",
-                    )
+                if key != "" or (key == "" and self.get_char_at() == ":"):
+                    # If the string is empty but there is a object divider, we are done here
                     break
-                elif key == "" and self.index == current_index:
-                    # Sometimes the string search might not move the index at all, that might lead us to an infinite loop
-                    self.index += 1
 
             self.skip_whitespaces_at()
 
@@ -226,13 +214,6 @@ class JSONParser:
             # Remove trailing spaces
             self.skip_whitespaces_at()
 
-        # Especially at the end of an LLM generated json you might miss the last "}"
-        if (self.get_char_at() or "}") != "}":
-            self.log(
-                "While parsing an object, we couldn't find the closing }, ignoring",
-                "info",
-            )
-
         self.index += 1
         return obj
 
@@ -261,13 +242,6 @@ class JSONParser:
             while char and (char.isspace() or char == ","):
                 self.index += 1
                 char = self.get_char_at()
-            # If this is the right value of an object and we are closing the object, it means the array is over
-            if self.get_context() == "object_value" and char == "}":
-                self.log(
-                    "While parsing an array inside an object, we got to the end without finding a ]. Stopped parsing",
-                    "info",
-                )
-                break
 
         # Especially at the end of an LLM generated json you might miss the last "]"
         char = self.get_char_at()
@@ -275,14 +249,6 @@ class JSONParser:
             self.log(
                 "While parsing an array we missed the closing ], adding it back", "info"
             )
-            # Sometimes when you fix a missing "]" you'll have a trailing "," there that makes the JSON invalid
-            if char == ",":
-                # Remove trailing "," before adding the "]"
-                self.log(
-                    "While parsing an array, found a trailing , before adding ]",
-                    "info",
-                )
-
             self.index -= 1
 
         self.index += 1
@@ -337,7 +303,11 @@ class JSONParser:
 
         # There is sometimes a weird case of doubled quotes, we manage this also later in the while loop
         if self.get_char_at() == lstring_delimiter:
-            # This is a valid exception only if it's closed by a double delimiter again
+            # If it's an empty key, this was easy
+            if self.get_context() == "object_key" and self.get_char_at(1) == ":":
+                self.index += 1
+                return ""
+            # Find the next delimiter
             i = 1
             next_c = self.get_char_at(i)
             while next_c and next_c != rstring_delimiter:
@@ -429,6 +399,7 @@ class JSONParser:
                         "While parsing a string, we found a doubled quote, ignoring it",
                         "info",
                     )
+                    self.index += 1
                 elif missing_quotes and self.get_context() == "object_value":
                     # In case of missing starting quote I need to check if the delimeter is the end or the beginning of a key
                     i = 1
@@ -467,7 +438,7 @@ class JSONParser:
                     ]:
                         # This is a bit of a weird workaround, essentially in object_value context we don't always break on commas
                         # This is because the routine after will make sure to correct any bad guess and this solves a corner case
-                        if next_c.isalpha():
+                        if check_comma_in_object_value and next_c.isalpha():
                             check_comma_in_object_value = False
                         # If we are in an object context, let's check for the right delimiters
                         if (
@@ -575,22 +546,18 @@ class JSONParser:
             # The number ends with a non valid character for a number/currency, rolling back one
             number_str = number_str[:-1]
             self.index -= 1
-        if number_str:
-            try:
-                if "," in number_str:
-                    return str(number_str)
-                if "." in number_str or "e" in number_str or "E" in number_str:
-                    return float(number_str)
-                elif number_str == "-":
-                    # If there is a stray "-" this will throw an exception, throw away this character
-                    return self.parse_json()
-                else:
-                    return int(number_str)
-            except ValueError:
-                return number_str
-        else:
-            # If nothing works, let's skip and keep parsing
-            return self.parse_json()
+        try:
+            if "," in number_str:
+                return str(number_str)
+            if "." in number_str or "e" in number_str or "E" in number_str:
+                return float(number_str)
+            elif number_str == "-":
+                # If there is a stray "-" this will throw an exception, throw away this character
+                return self.parse_json()
+            else:
+                return int(number_str)
+        except ValueError:
+            return number_str
 
     def parse_boolean_or_null(self) -> Union[bool, str, None]:
         # <boolean> is one of the literal strings 'true', 'false', or 'null' (unquoted)
@@ -644,16 +611,10 @@ class JSONParser:
             self.context.append(value)
 
     def reset_context(self) -> None:
-        try:
-            self.context.pop()
-        except Exception:
-            return
+        self.context.pop()
 
     def get_context(self) -> str:
-        try:
-            return self.context[-1]
-        except Exception:
-            return ""
+        return self.context[-1]
 
     def log(self, text: str, level: str) -> None:
         if level == self.logger.log_level:

{json_repair-0.27.1 → json_repair-0.28.0/src/json_repair.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.27.1
+Version: 0.28.0
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License
@@ -27,6 +27,7 @@ License: MIT License
         
 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
@@ -38,7 +39,7 @@ License-File: LICENSE
 [![PyPI](https://img.shields.io/pypi/v/json-repair)](https://pypi.org/project/json-repair/)
 ![Python version](https://img.shields.io/badge/python-3.8+-important)
 [![PyPI downloads](https://img.shields.io/pypi/dm/json-repair)](https://pypi.org/project/json-repair/)
-
+[![Github Sponsors](https://img.shields.io/github/sponsors/mangiucugna)](https://github.com/sponsors/mangiucugna)
 
 This simple package can be used to fix an invalid json string. To know all cases in which this package will work, check out the unit test.
 

{json_repair-0.27.1 → json_repair-0.28.0}/src/json_repair.egg-info/SOURCES.txt

@@ -3,9 +3,11 @@ README.md
 pyproject.toml
 src/json_repair/__init__.py
 src/json_repair/json_repair.py
+src/json_repair/py.typed
 src/json_repair.egg-info/PKG-INFO
 src/json_repair.egg-info/SOURCES.txt
 src/json_repair.egg-info/dependency_links.txt
 src/json_repair.egg-info/top_level.txt
+tests/test_coverage.py
 tests/test_json_repair.py
 tests/test_performance.py

json_repair-0.28.0/tests/test_coverage.py

@@ -0,0 +1,18 @@
+import coverage
+import sys
+
+COVERAGE_THRESHOLD = 100
+
+cov = coverage.Coverage()
+cov.start()
+
+import pytest
+retcode = pytest.main(["./tests/test_json_repair.py", "--cov-config=.coveragerc"])
+
+cov.stop()
+cov.save()
+coverage_percent = cov.report(show_missing=True)
+
+if coverage_percent < COVERAGE_THRESHOLD:
+    print(f"ERROR: Coverage {coverage_percent:.2f}% is below the threshold of {COVERAGE_THRESHOLD}%")
+    sys.exit(1)  # This will prevent the commit/push

{json_repair-0.27.1 → json_repair-0.28.0}/tests/test_json_repair.py

@@ -94,10 +94,12 @@ def test_missing_and_mixed_quotes():
         repair_json('{"name": "John", "age": 30, "city": "New')
         == '{"name": "John", "age": 30, "city": "New"}'
     )
-    assert repair_json('[{"key": "value", COMMENT "notes": "lorem "ipsum", sic."}]') == '[{"key": "value", "notes": "lorem \\"ipsum\\", sic."}]'
+    assert repair_json('[{"key": "value", COMMENT "notes": "lorem "ipsum", sic." }]') == '[{"key": "value", "notes": "lorem \\"ipsum\\", sic."}]'
     assert repair_json('{"key": ""value"}') == '{"key": "value"}'
     assert repair_json('{"key": "value", 5: "value"}') == '{"key": "value", "5": "value"}'
     assert repair_json('{"foo": "\\"bar\\""') == '{"foo": "\\"bar\\""}'
+    assert repair_json('{"" key":"val"') == '{" key": "val"}'
+    assert repair_json('{"key": value "key2" : "value2" ') == '{"key": "value", "key2": "value2"}'
 
 def test_array_edge_cases():
     assert repair_json("[1, 2, 3,") == "[1, 2, 3]"
@@ -106,16 +108,9 @@ def test_array_edge_cases():
     assert repair_json("[1, 2, '...', 3]") == '[1, 2, "...", 3]'
     assert repair_json("[true, false, null, ...]") == '[true, false, null]'
     assert repair_json('["a" "b" "c" 1') == '["a", "b", "c", 1]'
-    assert (
-        repair_json('{"employees":["John", "Anna",')
-        == '{"employees": ["John", "Anna"]}'
-    )
-    assert (
-        repair_json('{"employees":["John", "Anna", "Peter')
-        == '{"employees": ["John", "Anna", "Peter"]}'
-    )
+    assert repair_json('{"employees":["John", "Anna",') == '{"employees": ["John", "Anna"]}'
+    assert repair_json('{"employees":["John", "Anna", "Peter') == '{"employees": ["John", "Anna", "Peter"]}'
     assert repair_json('{"key1": {"key2": [1, 2, 3') == '{"key1": {"key2": [1, 2, 3]}}'
-
     
 def test_escaping():
     assert repair_json("'\"'") == '""'
@@ -125,20 +120,12 @@ def test_escaping():
     assert repair_json('{"key\t_": "value"}') == '{"key\\t_": "value"}'
     
     
-def test_object_edge_cases():    
-    assert {
-        repair_json('{"value_1": "value_2": "data"}') == '{"value_1": "value_2", "data": ""}'
-    }
-    assert {
-        repair_json('{"value_1": true, COMMENT "value_2": "data"}') == '{"value_1": "value_2", "": "data"}'
-    }
+def test_object_edge_cases():
+    assert repair_json('{       ') == '{}'
+    assert repair_json('{"": "value"') == '{"": "value"}'
+    assert repair_json('{"value_1": true, COMMENT "value_2": "data"}') == '{"value_1": true, "value_2": "data"}'
     assert repair_json('{"value_1": true, SHOULD_NOT_EXIST "value_2": "data" AAAA }') == '{"value_1": true, "value_2": "data"}'
-    assert {
-        repair_json('{"" : true, "key2": "value2"}') == '{" ": true, "key2": "value_2"}'
-    }
-    assert {
-        repair_json('{"": true, "key2": "value2"}') == '{"empty_placeholder": true, "key2": "value_2"}'
-    }
+    assert repair_json('{"" : true, "key2": "value2"}') == '{"": true, "key2": "value2"}'
     assert repair_json('{""answer"":[{""traits"":''Female aged 60+'',""answer1"":""5""}]}') == '{"answer": [{"traits": "Female aged 60+", "answer1": "5"}]}'
     assert repair_json('{ "words": abcdef", "numbers": 12345", "words2": ghijkl" }') == '{"words": "abcdef", "numbers": 12345, "words2": "ghijkl"}'
     assert repair_json('''{"number": 1,"reason": "According...""ans": "YES"}''') == '{"number": 1, "reason": "According...", "ans": "YES"}'
@@ -147,6 +134,8 @@ def test_object_edge_cases():
     assert repair_json('{"key": "Lorem "ipsum" s,"}') == '{"key": "Lorem \\"ipsum\\" s,"}'
     assert repair_json('{"lorem": ipsum, sic, datum.",}') == '{"lorem": "ipsum, sic, datum."}'
     assert repair_json('{"lorem": sic tamet. "ipsum": sic tamet, quick brown fox. "sic": ipsum}') == '{"lorem": "sic tamet.", "ipsum": "sic tamet", "sic": "ipsum"}'
+    assert repair_json('{"key":value, " key2":"value2" }') == '{"key": "value", " key2": "value2"}'
+    assert repair_json('{"key":value "key2":"value2" }') == '{"key": "value", "key2": "value2"}'
 
 def test_number_edge_cases():
     assert repair_json(' - { "test_key": ["test_value", "test_value2"] }') == '{"test_key": ["test_value", "test_value2"]}'
@@ -159,6 +148,7 @@ def test_number_edge_cases():
     assert repair_json('{"key": 1/3, "foo": "bar"}') == '{"key": "1/3", "foo": "bar"}'
     assert repair_json('{"key": 10-20}') == '{"key": "10-20"}'
     assert repair_json('{"key": 1.1.1}') == '{"key": "1.1.1"}'
+    assert repair_json('[- ') == '[]'
 
 def test_markdown():
     assert repair_json('{ "content": "[LINK]("https://google.com")" }') == '{"content": "[LINK](\\"https://google.com\\")"}'