Fixes and more tests

Author: mauvilsa

deepdiff/colored_view.py

@@ -1,9 +1,10 @@
 import json
+import os
 from ast import literal_eval
 from importlib.util import find_spec
 from typing import Any, Dict
 
-if find_spec("colorama"):
+if os.name == "nt" and find_spec("colorama"):
     import colorama
 
     colorama.init()
@@ -14,6 +15,7 @@
 GREEN = '\033[32m'
 RESET = '\033[0m'
 
+
 class ColoredView:
     """A view that shows JSON with color-coded differences."""
 
@@ -127,7 +129,7 @@ def _colorize_json(self, obj: Any, path: str = 'root', indent: int = 0) -> str:
     def __str__(self) -> str:
         """Return the colorized, pretty-printed JSON string."""
         self._colorize_skip_paths = set()
-        return self._colorize_json(self.t2, indent=0)
+        return self._colorize_json(self.t2)
 
     def __iter__(self):
         """Make the view iterable by yielding the tree results."""

deepdiff/commands.py

@@ -54,7 +54,7 @@ def cli():
 @click.option('--significant-digits', required=False, default=None, type=int, show_default=True)
 @click.option('--truncate-datetime', required=False, type=click.Choice(['second', 'minute', 'hour', 'day'], case_sensitive=True), show_default=True, default=None)
 @click.option('--verbose-level', required=False, default=1, type=click.IntRange(0, 2), show_default=True)
-@click.option('--view', required=False, type=click.Choice(['tree', 'colored', 'colored_compact'], case_sensitive=True), show_default=True, default="tree")
+@click.option('--view', required=False, type=click.Choice(['tree', 'colored', 'colored_compact'], case_sensitive=True))
 @click.option('--debug', is_flag=True, show_default=False)
 def diff(
     *args, **kwargs
@@ -75,6 +75,8 @@ def diff(
     t2_path = kwargs.pop("t2")
     t1_extension = t1_path.split('.')[-1]
     t2_extension = t2_path.split('.')[-1]
+    if "view" in kwargs and kwargs["view"] is None:
+        kwargs.pop("view")
 
     for name, t_path, t_extension in [('t1', t1_path, t1_extension), ('t2', t2_path, t2_extension)]:
         try:

deepdiff/diff.py

@@ -25,7 +25,8 @@
                              type_is_subclass_of_type_group, type_in_type_group, get_doc,
                              number_to_string, datetime_normalize, KEY_TO_VAL_STR, booleans,
                              np_ndarray, np_floating, get_numpy_ndarray_rows, RepeatedTimer,
-                             TEXT_VIEW, TREE_VIEW, DELTA_VIEW, COLORED_VIEW, COLORED_COMPACT_VIEW, __dict__, add_root_to_paths,
+                             TEXT_VIEW, TREE_VIEW, DELTA_VIEW, COLORED_VIEW, COLORED_COMPACT_VIEW,
+                             detailed__dict__, add_root_to_paths,
                              np, get_truncate_datetime, dict_, CannotCompare, ENUM_INCLUDE_KEYS,
                              PydanticBaseModel, Opcode, SetOrdered, ipranges)
 from deepdiff.serialization import SerializationMixin
@@ -366,7 +367,8 @@ def _group_by_sort_key(x):
 
             self.tree.remove_empty_keys()
             view_results = self._get_view_results(self.view)
-            if self.view in {COLORED_VIEW, COLORED_COMPACT_VIEW}:
+            if isinstance(view_results, ColoredView):
+                self.update(view_results.tree)
                 self._colored_view = view_results
             else:
                 self.update(view_results)
@@ -1907,11 +1909,6 @@ def affected_root_keys(self):
                         result.add(root_key)
         return result
 
-    def __bool__(self):
-        if hasattr(self, '_colored_view') and self.view in {COLORED_VIEW, COLORED_COMPACT_VIEW}:
-            return bool(self.tree)  # Use the tree for boolean evaluation, not the view
-        return super().__bool__()
-
     def __str__(self):
         if hasattr(self, '_colored_view') and self.view in {COLORED_VIEW, COLORED_COMPACT_VIEW}:
             return str(self._colored_view)

tests/test_colored_view.py

@@ -2,6 +2,7 @@
 from deepdiff.helper import COLORED_VIEW, COLORED_COMPACT_VIEW
 from deepdiff.colored_view import RED, GREEN, RESET
 
+
 def test_colored_view_basic():
     t1 = {
         "name": "John",
@@ -45,6 +46,7 @@ def test_colored_view_basic():
 }}'''
     assert result == expected
 
+
 def test_colored_view_nested_changes():
     t1 = {
         "level1": {
@@ -80,6 +82,7 @@ def test_colored_view_nested_changes():
 }}'''
     assert result == expected
 
+
 def test_colored_view_list_changes():
     t1 = [1, 2, 3, 4]
     t2 = [1, 5, 3, 6]
@@ -95,6 +98,7 @@ def test_colored_view_list_changes():
 ]'''
     assert result == expected
 
+
 def test_colored_view_list_deletions():
     t1 = [1, 2, 3, 4, 5, 6]
     t2 = [2, 4]
@@ -112,7 +116,59 @@ def test_colored_view_list_deletions():
 ]'''
     assert result == expected
 
-def test_colored_view_with_ignore_order():
+
+def test_colored_view_list_additions():
+    t1 = [2, 4]
+    t2 = [1, 2, 3, 4, 5]
+
+    diff = DeepDiff(t1, t2, view=COLORED_VIEW)
+    result = str(diff)
+
+    expected = f'''[
+  {GREEN}1{RESET},
+  2,
+  {GREEN}3{RESET},
+  4,
+  {GREEN}5{RESET}
+]'''
+    assert result == expected
+
+
+def test_colored_view_list_changes_deletions():
+    t1 = [1, 5, 7, 3, 6]
+    t2 = [1, 2, 3, 4]
+
+    diff = DeepDiff(t1, t2, view=COLORED_VIEW)
+    result = str(diff)
+
+    expected = f'''[
+  1,
+  {RED}5{RESET} -> {GREEN}2{RESET},
+  {RED}7{RESET},
+  3,
+  {RED}6{RESET} -> {GREEN}4{RESET}
+]'''
+    assert result == expected
+
+
+def test_colored_view_list_changes_additions():
+    t1 = [1, 2, 3, 4]
+    t2 = [1, 5, 7, 3, 6]
+
+    diff = DeepDiff(t1, t2, view=COLORED_VIEW)
+    result = str(diff)
+
+    expected = f'''[
+  1,
+  {RED}2{RESET} -> {GREEN}5{RESET},
+  {GREEN}7{RESET},
+  3,
+  {RED}4{RESET} -> {GREEN}6{RESET}
+]'''
+    assert result == expected
+
+
+def test_colored_view_list_no_changes_with_ignore_order():
     t1 = [1, 2, 3]
     t2 = [3, 2, 1]
 
@@ -126,7 +182,8 @@ def test_colored_view_with_ignore_order():
 ]'''
     assert result == expected
 
-def test_colored_view_with_empty_diff():
+
+def test_colored_view_no_changes():
     t1 = {"a": 1, "b": 2}
     t2 = {"a": 1, "b": 2}
 
@@ -139,6 +196,7 @@ def test_colored_view_with_empty_diff():
 }'''
     assert result == expected
 
+
 def test_compact_view_basic():
     t1 = {
         "name": "John",
@@ -194,6 +252,7 @@ def test_compact_view_basic():
 }}'''
     assert result == expected
 
+
 def test_compact_view_nested_changes():
     t1 = {
         "level1": {
@@ -251,6 +310,7 @@ def test_compact_view_nested_changes():
 }}'''
     assert result == expected
 
+
 def test_compact_view_no_changes():
     # Test with dict
     t1 = {"a": 1, "b": [1, 2], "c": {"x": True}}
@@ -264,6 +324,7 @@ def test_compact_view_no_changes():
     diff = DeepDiff(t1, t2, view=COLORED_COMPACT_VIEW)
     assert str(diff) == "[...]"
 
+
 def test_compact_view_list_changes():
     t1 = [1, {"a": 1, "b": {"x": 1, "y": 2}}, [1, 2, {"z": 3}]]
     t2 = [1, {"a": 2, "b": {"x": 1, "y": 2}}, [1, 2, {"z": 3}]]
@@ -281,6 +342,7 @@ def test_compact_view_list_changes():
 ]'''
     assert result == expected
 
+
 def test_compact_view_primitive_siblings():
     t1 = {
         "changed": 1,
@@ -333,4 +395,3 @@ def test_colored_view_bool_evaluation():
     # Scenario 2: With differences
     diff_with_diff_compact = DeepDiff(t1_with_diff, t2_with_diff, view=COLORED_COMPACT_VIEW)
     assert bool(diff_with_diff_compact), "bool(diff) should be True when diffs exist (compact view)"
-