fixing more edge cases

Author: seperman

deepdiff/delta.py

@@ -944,14 +944,14 @@ def _from_flat_dicts(flat_dict_list):
                 result[action][path_str] = value
             elif action == 'values_changed':
                 if old_value == UnkownValueCode:
-                    result[action][path_str] = {'new_value': value, 'new_path': new_path}
+                    result[action][path_str] = {'new_value': value}
                 else:
-                    result[action][path_str] = {'new_value': value, 'old_value': old_value, 'new_path': new_path}
+                    result[action][path_str] = {'new_value': value, 'old_value': old_value}
             elif action == 'type_changes':
                 type_ = flat_dict.get('type', UnkownValueCode)
                 old_type = flat_dict.get('old_type', UnkownValueCode)
 
-                result[action][path_str] = {'new_value': value, 'new_path': new_path}
+                result[action][path_str] = {'new_value': value}
                 for elem, elem_value in [
                     ('new_type', type_),
                     ('old_type', old_type),
@@ -960,13 +960,9 @@ def _from_flat_dicts(flat_dict_list):
                     if elem_value != UnkownValueCode:
                         result[action][path_str][elem] = elem_value
             elif action == 'iterable_item_moved':
-                result[action][path_str] = {
-                    'new_path': stringify_path(
-                        flat_dict.get('new_path', ''),
-                        root_element=('root', GET)
-                    ),
-                    'value': value,
-                }
+                result[action][path_str] = {'value': value}
+            if new_path:
+                result[action][path_str]['new_path'] = new_path
 
         return result
 

deepdiff/diff.py

@@ -1280,7 +1280,13 @@ def get_other_pair(hash_value, in_t1=True):
                 other = get_other_pair(hash_value)
                 item_id = id(other.item)
                 indexes = t2_hashtable[hash_value].indexes if other.item is notpresent else other.indexes
-                index2 = t2_hashtable[hash_value].indexes[0]
+                # When we report repetitions, we want the child_relationship_param2 only if there is no repetition.
+                # Because when there is a repetition, we report it in a different way (iterable_items_added_at_indexes for example).
+                # When there is no repetition, we want child_relationship_param2 so that we report the "new_path" correctly.
+                if len(t2_hashtable[hash_value].indexes) == 1:
+                    index2 = t2_hashtable[hash_value].indexes[0]
+                else:
+                    index2 = None
                 for i in indexes:
                     change_level = level.branch_deeper(
                         other.item,
@@ -1299,7 +1305,13 @@ def get_other_pair(hash_value, in_t1=True):
                     return  # pragma: no cover. This is already covered for addition.
                 other = get_other_pair(hash_value, in_t1=False)
                 item_id = id(other.item)
-                index2 = None if other.item is notpresent else other.indexes[0]
+                # When we report repetitions, we want the child_relationship_param2 only if there is no repetition.
+                # Because when there is a repetition, we report it in a different way (iterable_items_added_at_indexes for example).
+                # When there is no repetition, we want child_relationship_param2 so that we report the "new_path" correctly.
+                if other.item is notpresent or len(other.indexes > 1):
+                    index2 = None
+                else:
+                    index2 = other.indexes[0]
                 for i in t1_hashtable[hash_value].indexes:
                     change_level = level.branch_deeper(
                         t1_hashtable[hash_value].item,

tests/test_delta.py

@@ -1020,10 +1020,12 @@ def test_delta_cases(self, test_name, t1, t2, deepdiff_kwargs, to_delta_kwargs,
             },
             'values_changed': {
                 'root[6]': {
-                    'new_value': 7
+                    'new_value': 7,
+                    'new_path': 'root[0]',
                 },
                 'root[0]': {
-                    'new_value': 8
+                    'new_value': 8,
+                    'new_path': 'root[6]',
                 }
             }
         },