Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase float precision to increase correctness for highly nested dicts #57

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Increase float precision to increase correctness for highly nested dicts #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51b2944
Increase float precision to increase correctness for highly nested dicts
regalmoix Feb 10, 2023
71aced1
Use Fraction instead of decimal
regalmoix Feb 12, 2023
86b12db
Add unittest for deep nested diff in dict
regalmoix Feb 12, 2023
b5d7d5b
Enhance similarity to offer kwarg option to return similarity score a…
regalmoix Feb 12, 2023
89c6b79
Fix comment
regalmoix Feb 12, 2023
2649c64
Merge branch 'xlwings:master' into master
regalmoix Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions jsondiff/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
__version__ = '2.0.0'
__version__ = '2.0.1'

import sys
import json

import sys
from fractions import Fraction
from .symbols import *
from .symbols import Symbol

Expand Down Expand Up @@ -71,7 +71,7 @@ def unpatch(self, a, d):

class CompactJsonDiffSyntax(object):
def emit_set_diff(self, a, b, s, added, removed):
if s == 0.0 or len(removed) == len(a):
if s == Fraction(0.0) or len(removed) == len(a):
return {replace: b} if isinstance(b, dict) else b
else:
d = {}
Expand All @@ -82,9 +82,9 @@ def emit_set_diff(self, a, b, s, added, removed):
return d

def emit_list_diff(self, a, b, s, inserted, changed, deleted):
if s == 0.0:
if s == Fraction(0.0):
return {replace: b} if isinstance(b, dict) else b
elif s == 1.0:
elif s == Fraction(1.0):
return {}
else:
d = changed
Expand All @@ -95,9 +95,9 @@ def emit_list_diff(self, a, b, s, inserted, changed, deleted):
return d

def emit_dict_diff(self, a, b, s, added, changed, removed):
if s == 0.0:
if s == Fraction(0.0):
return {replace: b} if isinstance(b, dict) else b
elif s == 1.0:
elif s == Fraction(1.0):
return {}
else:
changed.update(added)
Expand All @@ -106,7 +106,7 @@ def emit_dict_diff(self, a, b, s, added, changed, removed):
return changed

def emit_value_diff(self, a, b, s):
if s == 1.0:
if s == Fraction(1.0):
return {}
else:
return {replace: b} if isinstance(b, dict) else b
Expand Down Expand Up @@ -160,7 +160,7 @@ def patch(self, a, d):

class ExplicitJsonDiffSyntax(object):
def emit_set_diff(self, a, b, s, added, removed):
if s == 0.0 or len(removed) == len(a):
if s == Fraction(0.0) or len(removed) == len(a):
return b
else:
d = {}
Expand All @@ -171,9 +171,9 @@ def emit_set_diff(self, a, b, s, added, removed):
return d

def emit_list_diff(self, a, b, s, inserted, changed, deleted):
if s == 0.0:
if s == Fraction(0.0):
return b
elif s == 1.0:
elif s == Fraction(1.0):
return {}
else:
d = changed
Expand All @@ -184,9 +184,9 @@ def emit_list_diff(self, a, b, s, inserted, changed, deleted):
return d

def emit_dict_diff(self, a, b, s, added, changed, removed):
if s == 0.0:
if s == Fraction(0.0):
return b
elif s == 1.0:
elif s == Fraction(1.0):
return {}
else:
d = {}
Expand All @@ -199,15 +199,15 @@ def emit_dict_diff(self, a, b, s, added, changed, removed):
return d

def emit_value_diff(self, a, b, s):
if s == 1.0:
if s == Fraction(1.0):
return {}
else:
return b


class SymmetricJsonDiffSyntax(object):
def emit_set_diff(self, a, b, s, added, removed):
if s == 0.0 or len(removed) == len(a):
if s == Fraction(0.0) or len(removed) == len(a):
return [a, b]
else:
d = {}
Expand All @@ -218,9 +218,9 @@ def emit_set_diff(self, a, b, s, added, removed):
return d

def emit_list_diff(self, a, b, s, inserted, changed, deleted):
if s == 0.0:
if s == Fraction(0.0):
return [a, b]
elif s == 1.0:
elif s == Fraction(1.0):
return {}
else:
d = changed
Expand All @@ -231,9 +231,9 @@ def emit_list_diff(self, a, b, s, inserted, changed, deleted):
return d

def emit_dict_diff(self, a, b, s, added, changed, removed):
if s == 0.0:
if s == Fraction(0.0):
return [a, b]
elif s == 1.0:
elif s == Fraction(1.0):
return {}
else:
d = changed
Expand All @@ -244,7 +244,7 @@ def emit_dict_diff(self, a, b, s, added, changed, removed):
return d

def emit_value_diff(self, a, b, s):
if s == 1.0:
if s == Fraction(1.0):
return {}
else:
return [a, b]
Expand Down Expand Up @@ -355,7 +355,8 @@ class Options(object):
pass

def __init__(self, syntax='compact', load=False, dump=False, marshal=False,
loader=default_loader, dumper=default_dumper, escape_str='$'):
loader=default_loader, dumper=default_dumper, escape_str='$',
return_similarity_as_float=True):
self.options = JsonDiffer.Options()
self.options.syntax = builtin_syntaxes.get(syntax, syntax)
self.options.load = load
Expand All @@ -364,6 +365,7 @@ def __init__(self, syntax='compact', load=False, dump=False, marshal=False,
self.options.loader = loader
self.options.dumper = dumper
self.options.escape_str = escape_str
self.options.return_similarity_as_float = return_similarity_as_float
self._symbol_map = {
escape_str + symbol.label: symbol
for symbol in _all_symbols_
Expand All @@ -380,11 +382,11 @@ def _list_diff_0(self, C, X, Y):
i, j = i - 1, j - 1
continue
if j > 0 and (i == 0 or C[i][j-1] >= C[i-1][j]):
r.append((1, Y[j-1], j-1, 0.0))
r.append((1, Y[j-1], j-1, Fraction(0.0)))
j = j - 1
continue
if i > 0 and (j == 0 or C[i][j-1] < C[i-1][j]):
r.append((-1, X[i-1], i-1, 0.0))
r.append((-1, X[i-1], i-1, Fraction(0.0)))
i = i - 1
continue
return reversed(r)
Expand All @@ -407,8 +409,7 @@ def _list_diff(self, X, Y):
inserted = []
deleted = []
changed = {}
tot_s = 0.0

tot_s = Fraction(0.0)
for sign, value, pos, s in self._list_diff_0(C, X, Y):
if sign == 1:
inserted.append((pos, value))
Expand All @@ -419,7 +420,7 @@ def _list_diff(self, X, Y):
tot_s += s
tot_n = len(X) + len(inserted)
if tot_n == 0:
s = 1.0
s = Fraction(1.0)
else:
s = tot_s / tot_n
return self.options.syntax.emit_list_diff(X, Y, s, inserted, changed, deleted), s
Expand All @@ -428,7 +429,7 @@ def _set_diff(self, a, b):
removed = a.difference(b)
added = b.difference(a)
if not removed and not added:
return {}, 1.0
return {}, Fraction(1.0)
ranking = sorted(
(
(self._obj_diff(x, y)[1], x, y)
Expand All @@ -441,7 +442,7 @@ def _set_diff(self, a, b):
r2 = set(removed)
a2 = set(added)
n_common = len(a) - len(removed)
s_common = float(n_common)
s_common = Fraction(n_common)
for s, x, y in ranking:
if x in r2 and y in a2:
r2.discard(x)
Expand All @@ -451,15 +452,15 @@ def _set_diff(self, a, b):
if not r2 or not a2:
break
n_tot = len(a) + len(added)
s = s_common / n_tot if n_tot != 0 else 1.0
s = s_common / n_tot if n_tot != 0 else Fraction(1.0)
return self.options.syntax.emit_set_diff(a, b, s, added, removed), s

def _dict_diff(self, a, b):
removed = {}
nremoved = 0
nadded = 0
nmatched = 0
smatched = 0.0
smatched = Fraction(0.0)
added = {}
changed = {}
for k, v in a.items():
Expand All @@ -470,20 +471,20 @@ def _dict_diff(self, a, b):
else:
nmatched += 1
d, s = self._obj_diff(v, w)
if s < 1.0:
if s < Fraction(1.0):
changed[k] = d
smatched += 0.5 + 0.5 * s
smatched += Fraction(0.5) + Fraction(0.5) * s
for k, v in b.items():
if k not in a:
nadded += 1
added[k] = v
n_tot = nremoved + nmatched + nadded
s = smatched / n_tot if n_tot != 0 else 1.0
s = smatched / n_tot if n_tot != 0 else Fraction(1.0)
return self.options.syntax.emit_dict_diff(a, b, s, added, changed, removed), s

def _obj_diff(self, a, b):
if a is b:
return self.options.syntax.emit_value_diff(a, b, 1.0), 1.0
return self.options.syntax.emit_value_diff(a, b, Fraction(1.0)), Fraction(1.0)
if isinstance(a, dict) and isinstance(b, dict):
return self._dict_diff(a, b)
elif isinstance(a, tuple) and isinstance(b, tuple):
Expand All @@ -493,9 +494,9 @@ def _obj_diff(self, a, b):
elif isinstance(a, set) and isinstance(b, set):
return self._set_diff(a, b)
elif a != b:
return self.options.syntax.emit_value_diff(a, b, 0.0), 0.0
return self.options.syntax.emit_value_diff(a, b, Fraction(0.0)), Fraction(0.0)
else:
return self.options.syntax.emit_value_diff(a, b, 1.0), 1.0
return self.options.syntax.emit_value_diff(a, b, Fraction(1.0)), Fraction(1.0)

def diff(self, a, b, fp=None):
if self.options.load:
Expand All @@ -519,7 +520,7 @@ def similarity(self, a, b):

d, s = self._obj_diff(a, b)

return s
return float(s) if self.options.return_similarity_as_float else s

def patch(self, a, d, fp=None):
if self.options.load:
Expand Down Expand Up @@ -551,7 +552,6 @@ def unpatch(self, b, d, fp=None):
else:
return a


def _unescape(self, x):
if isinstance(x, string_types):
sym = self._symbol_map.get(x, None)
Expand Down
22 changes: 19 additions & 3 deletions tests/test_jsondiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys
import unittest

from jsondiff import diff, replace, add, discard, insert, delete, update, JsonDiffer
from jsondiff import diff, replace, add, discard, insert, delete, similarity, JsonDiffer

from .utils import generate_random_json, perturbate_json

Expand Down Expand Up @@ -63,7 +63,7 @@ def test_a(self):
diff(['x', 'a', {'v': 11}, 'c', 'x'], ['a', {'v': 20}, 'b', 'c'])
)
self.assertEqual(
{insert: [(2, 'b')], delete: [4, 0], 1: {'v': 20}},
{insert: [(2, 'b')], delete: [4, 0], 1: {'v': 20}},
diff(['x', 'a', {'u': 10, 'v': 11}, 'c', 'x'], ['a', {'u': 10, 'v': 20}, 'b', 'c'])
)

Expand Down Expand Up @@ -99,7 +99,6 @@ def test_compact_syntax(self, scenario):
dm = differ.marshal(d)
self.assertEqual(d, differ.unmarshal(dm))


@given(strategies.randoms().map(generate_scenario))
@settings(max_examples=1000)
def test_explicit_syntax(self, scenario):
Expand Down Expand Up @@ -134,3 +133,20 @@ def test_long_arrays(self):
self.fail('cannot diff long arrays')
finally:
sys.setrecursionlimit(r)

def test_deeply_nested_dict_diff(self):
d1 = {'a': 1}
d2 = {'a': 2}
sys.setrecursionlimit(100000)
# make dicts nested at 10000 depth, differing only at the leaf-node (inner-most) level.
for _ in range(10000):
d1 = {'a': d1}
d2 = {'a': d2}

self.assertNotEqual({}, diff(d1, d2))
self.assertEqual(d2, diff(d1, d2))
self.assertEqual(d1, diff(d2, d1))

self.assertEqual(1.0, similarity(d1, d2))
similarity_fraction = similarity(d1, d2, return_similarity_as_float=False)
self.assertEqual(1, similarity_fraction.denominator - similarity_fraction.numerator)