json-repair 0.40.0__tar.gz → 0.41.0__tar.gz

{json_repair-0.40.0/src/json_repair.egg-info → json_repair-0.41.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: json_repair
-Version: 0.40.0
+Version: 0.41.0
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License
@@ -35,6 +35,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+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.9+-important)

{json_repair-0.40.0 → json_repair-0.41.0}/pyproject.toml

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

{json_repair-0.40.0 → json_repair-0.41.0}/src/json_repair/json_parser.py

@@ -2,6 +2,7 @@ from typing import Any, Dict, List, Literal, Optional, TextIO, Tuple, Union
 
 from .json_context import ContextValues, JsonContext
 from .string_file_wrapper import StringFileWrapper
+from .object_comparer import ObjectComparer
 
 JSONReturnType = Union[Dict[str, Any], List[Any], str, float, int, bool, None]
 
@@ -54,6 +55,9 @@ class JSONParser:
             while self.index < len(self.json_str):
                 j = self.parse_json()
                 if j != "":
+                    if ObjectComparer.is_same_object(json[-1], j):
+                        # replace the last entry with the new one since the new one seems an update
+                        json.pop()
                     json.append(j)
                 if self.index == last_index:
                     self.index += 1

json_repair-0.41.0/src/json_repair/object_comparer.py

@@ -0,0 +1,63 @@
+from typing import Any
+
+
+class ObjectComparer:
+    def __init__(self) -> None:
+        return
+
+    @staticmethod
+    def is_same_object(obj1: Any, obj2: Any, path: str = "") -> bool:
+        """
+        Recursively compares two objects and ensures that:
+        - Their types match
+        - Their keys/structure match
+        """
+        if type(obj1) is not type(obj2):
+            # Fail immediately if the types don't match
+            print(
+                f"Type mismatch at {path}: {type(obj1).__name__} vs {type(obj2).__name__}"
+            )
+            return False
+
+        if isinstance(obj1, dict) and isinstance(obj2, dict):
+            # Compare dictionary keys
+            keys1, keys2 = set(obj1.keys()), set(obj2.keys())
+            common_keys = keys1 & keys2
+            extra_keys1 = keys1 - keys2
+            extra_keys2 = keys2 - keys1
+
+            if extra_keys1:
+                print(f"Extra keys in first object at {path}: {extra_keys1}")
+                return False
+            if extra_keys2:
+                print(f"Extra keys in second object at {path}: {extra_keys2}")
+                return False
+
+            # Recursively compare the common keys
+            for key in common_keys:
+                if not ObjectComparer.is_same_object(
+                    obj1[key], obj2[key], path=f"{path}/{key}"
+                ):
+                    return False
+
+        elif isinstance(obj1, list) and isinstance(obj2, list):
+            # Compare lists
+            min_length = min(len(obj1), len(obj2))
+            if len(obj1) != len(obj2):
+                print(f"Length mismatch at {path}: {len(obj1)} vs {len(obj2)}")
+                return False
+
+            for i in range(min_length):
+                if not ObjectComparer.is_same_object(
+                    obj1[i], obj2[i], path=f"{path}[{i}]"
+                ):
+                    return False
+
+            if len(obj1) > len(obj2):
+                print(f"Extra items in first list at {path}: {obj1[min_length:]}")
+                return False
+            elif len(obj2) > len(obj1):
+                print(f"Extra items in second list at {path}: {obj2[min_length:]}")
+                return False
+
+        return True

{json_repair-0.40.0 → json_repair-0.41.0/src/json_repair.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: json_repair
-Version: 0.40.0
+Version: 0.41.0
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License
@@ -35,6 +35,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+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.9+-important)

{json_repair-0.40.0 → json_repair-0.41.0}/src/json_repair.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ src/json_repair/__main__.py
 src/json_repair/json_context.py
 src/json_repair/json_parser.py
 src/json_repair/json_repair.py
+src/json_repair/object_comparer.py
 src/json_repair/py.typed
 src/json_repair/string_file_wrapper.py
 src/json_repair.egg-info/PKG-INFO

{json_repair-0.40.0 → json_repair-0.41.0}/tests/test_json_repair.py

@@ -199,6 +199,7 @@ def test_multiple_jsons():
     assert repair_json("{}[]{}") == "[{}, [], {}]"
     assert repair_json('{"key":"value"}[1,2,3,True]') == '[{"key": "value"}, [1, 2, 3, true]]'
     assert repair_json('lorem ```json {"key":"value"} ``` ipsum ```json [1,2,3,True] ``` 42') == '[{"key": "value"}, [1, 2, 3, true]]'
+    assert repair_json('[{"key":"value"}][{"key":"value_after"}]') == '[{"key": "value_after"}]'
 
 def test_repair_json_with_objects():
     # Test with valid JSON strings