From 6ade6563eb4c1bdb38e3e47d0619fa89a4642351 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sun, 20 Oct 2024 13:43:09 +0200 Subject: [PATCH] [deep_diff] - alse check combine_upd_add --- deep_diff.py | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/deep_diff.py b/deep_diff.py index 065f0b1..ac28d91 100644 --- a/deep_diff.py +++ b/deep_diff.py @@ -39,28 +39,29 @@ if __name__ == '__main__': "results/WVWZZZE1ZMP010760/2024/10/18/vehicle_WVWZZZE1ZMP010760_2024-10-15T12-05-23-268Z.json", "results/WVWZZZE1ZMP010760/2024/10/19/vehicle_WVWZZZE1ZMP010760_2024-10-19T00-00-34-353Z.json", ] - for file in files: - print(f"-----------------------------------------------------------------------------------------------------------------") - print(f"--- Using file {file}") - print(f"-----------------------------------------------------------------------------------------------------------------") - with open(file, "r") as fp: - src = json.load(fp) - src_last = {} - diffed_list = [] - last = {} - for s in src: - diffed = jay_diff_full(last, s) - diffed_list.append(deepcopy(diffed)) - last = deepcopy(s) - print(f"Diffed: {diffed}") + for diff_mode_update_add in [True, False]: + for file in files: + print(f"-----------------------------------------------------------------------------------------------------------------") + print(f"--- Using file {file}, diff_mode_update_add={diff_mode_update_add}") + print(f"-----------------------------------------------------------------------------------------------------------------") + with open(file, "r") as fp: + src = json.load(fp) + src_last = {} + diffed_list = [] + last = {} + for s in src: + diffed = jay_diff_full(last, s, combine_upd_add=diff_mode_update_add) + diffed_list.append(deepcopy(diffed)) + last = deepcopy(s) + print(f"Diffed: {diffed}") - merged_list = [] - last = {} - for d in diffed_list: - merged = jay_merge_full(last, d) - last = deepcopy(merged) - merged_list.append(deepcopy(merged)) + merged_list = [] + last = {} + for d in diffed_list: + merged = jay_merge_full(last, d) + last = deepcopy(merged) + merged_list.append(deepcopy(merged)) - # Check integrity - assert src == merged_list + # Check integrity + assert src == merged_list