Merge branch 'refs/heads/main' into init_caching

# Conflicts:
#	cli/codeflash/verification/comparator.py

Author: alvin-r

codeflash/verification/comparator.py

@@ -1,3 +1,4 @@
+import ast
 import datetime
 import decimal
 import enum
@@ -47,7 +48,6 @@
 def comparator(orig: Any, new: Any, superset_obj=False) -> bool:
     """Compare two objects for equality recursively. If superset_obj is True, the new object is allowed to have more keys than the original object. However, the existing keys/values must be equivalent."""
     try:
-        # if not type_comparator(orig, new):
         if type(orig) is not type(new):
             type_obj = type(orig)
             new_type_obj = type(new)
@@ -66,6 +66,7 @@ def comparator(orig: Any, new: Any, superset_obj=False) -> bool:
                 bool,
                 complex,
                 type(None),
+                type(Ellipsis),
                 decimal.Decimal,
                 set,
                 bytes,
@@ -206,13 +207,16 @@ def comparator(orig: Any, new: Any, superset_obj=False) -> bool:
             if superset_obj:
                 # allow new object to be a superset of the original object
                 return all(k in new_keys and comparator(v, new_keys[k], superset_obj) for k, v in orig_keys.items())
+
+            if isinstance(orig, ast.AST):
+                orig_keys = {k: v for k, v in orig.__dict__.items() if k != "parent"}
+                new_keys = {k: v for k, v in new.__dict__.items() if k != "parent"}
             return comparator(orig_keys, new_keys, superset_obj)
 
         if type(orig) in [types.BuiltinFunctionType, types.BuiltinMethodType]:
             return new == orig
         if str(type(orig)) == "<class 'object'>":
             return True
-
         # TODO : Add other types here
         logger.warning(f"Unknown comparator input type: {type(orig)}")
         return False

tests/test_comparator.py

@@ -1,3 +1,5 @@
+import ast
+import copy
 import dataclasses
 import datetime
 import decimal
@@ -8,13 +10,15 @@
 
 import pydantic
 import pytest
+from pathlib import Path
+
 from codeflash.either import Failure, Success
 from codeflash.verification.comparator import comparator
 from codeflash.verification.equivalence import compare_test_results
 from codeflash.verification.test_results import FunctionTestInvocation, InvocationId, TestResults, TestType
 
 
-def test_basic_python_objects():
+def test_basic_python_objects() -> None:
     a = 5
     b = 5
     c = 6
@@ -122,40 +126,40 @@ def test_basic_python_objects():
     assert not comparator(a, c)
 
 
-def test_standard_python_library_objects():
-    a = datetime.datetime(2020, 2, 2, 2, 2, 2)
-    b = datetime.datetime(2020, 2, 2, 2, 2, 2)
-    c = datetime.datetime(2020, 2, 2, 2, 2, 3)
+def test_standard_python_library_objects() -> None:
+    a = datetime.datetime(2020, 2, 2, 2, 2, 2) # type: ignore
+    b = datetime.datetime(2020, 2, 2, 2, 2, 2) # type: ignore
+    c = datetime.datetime(2020, 2, 2, 2, 2, 3) # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
-    a = datetime.date(2020, 2, 2)
-    b = datetime.date(2020, 2, 2)
-    c = datetime.date(2020, 2, 3)
+    a = datetime.date(2020, 2, 2) # type: ignore
+    b = datetime.date(2020, 2, 2) # type: ignore
+    c = datetime.date(2020, 2, 3) # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
-    a = datetime.timedelta(days=1)
-    b = datetime.timedelta(days=1)
-    c = datetime.timedelta(days=2)
+    a = datetime.timedelta(days=1) # type: ignore
+    b = datetime.timedelta(days=1) # type: ignore
+    c = datetime.timedelta(days=2) # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
-    a = datetime.time(2, 2, 2)
-    b = datetime.time(2, 2, 2)
-    c = datetime.time(2, 2, 3)
+    a = datetime.time(2, 2, 2) # type: ignore
+    b = datetime.time(2, 2, 2) # type: ignore
+    c = datetime.time(2, 2, 3) # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
-    a = datetime.timezone.utc
-    b = datetime.timezone.utc
-    c = datetime.timezone(datetime.timedelta(hours=1))
+    a = datetime.timezone.utc # type: ignore
+    b = datetime.timezone.utc # type: ignore
+    c = datetime.timezone(datetime.timedelta(hours=1)) # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
-    a = decimal.Decimal(3.14)
-    b = decimal.Decimal(3.14)
-    c = decimal.Decimal(3.15)
+    a = decimal.Decimal(3.14) # type: ignore
+    b = decimal.Decimal(3.14) # type: ignore
+    c = decimal.Decimal(3.15) # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
@@ -169,15 +173,15 @@ class Color2(Enum):
         GREEN = auto()
         BLUE = auto()
 
-    a = Color.RED
-    b = Color.RED
-    c = Color.GREEN
+    a = Color.RED # type: ignore
+    b = Color.RED # type: ignore
+    c = Color.GREEN # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
-    a = Color2.RED
-    b = Color2.RED
-    c = Color2.GREEN
+    a = Color2.RED # type: ignore
+    b = Color2.RED # type: ignore
+    c = Color2.GREEN # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
@@ -186,9 +190,9 @@ class Color4(IntFlag):
         GREEN = auto()
         BLUE = auto()
 
-    a = Color4.RED
-    b = Color4.RED
-    c = Color4.GREEN
+    a = Color4.RED  # type: ignore
+    b = Color4.RED # type: ignore
+    c = Color4.GREEN # type: ignore
     assert comparator(a, b)
     assert not comparator(a, c)
 
@@ -298,7 +302,7 @@ def test_numpy():
 
 def test_scipy():
     try:
-        import scipy as sp
+        import scipy as sp # type: ignore
     except ImportError:
         pytest.skip()
     a = sp.sparse.csr_matrix([[1, 0, 0], [0, 0, 3], [4, 0, 5]])
@@ -468,7 +472,7 @@ def test_pandas():
 
 def test_pyrsistent():
     try:
-        from pyrsistent import PBag, PClass, PRecord, field, pdeque, pmap, pset, pvector
+        from pyrsistent import PBag, PClass, PRecord, field, pdeque, pmap, pset, pvector # type: ignore
     except ImportError:
         pytest.skip()
 
@@ -766,7 +770,7 @@ def test_compare_results_fn():
                 function_getting_tested="function_getting_tested",
                 iteration_id="0",
             ),
-            file_name="file_name",
+            file_name=Path("file_name"),
             did_pass=True,
             runtime=5,
             test_framework="unittest",
@@ -787,7 +791,7 @@ def test_compare_results_fn():
                 function_getting_tested="function_getting_tested",
                 iteration_id="0",
             ),
-            file_name="file_name",
+            file_name=Path("file_name"),
             did_pass=True,
             runtime=10,
             test_framework="unittest",
@@ -810,7 +814,7 @@ def test_compare_results_fn():
                 function_getting_tested="function_getting_tested",
                 iteration_id="0",
             ),
-            file_name="file_name",
+            file_name=Path("file_name"),
             did_pass=True,
             runtime=10,
             test_framework="unittest",
@@ -833,7 +837,7 @@ def test_compare_results_fn():
                 function_getting_tested="function_getting_tested",
                 iteration_id="0",
             ),
-            file_name="file_name",
+            file_name=Path("file_name"),
             did_pass=True,
             runtime=10,
             test_framework="unittest",
@@ -852,7 +856,7 @@ def test_compare_results_fn():
                 function_getting_tested="function_getting_tested",
                 iteration_id="2",
             ),
-            file_name="file_name",
+            file_name=Path("file_name"),
             did_pass=True,
             runtime=10,
             test_framework="unittest",
@@ -875,7 +879,7 @@ def test_compare_results_fn():
                 function_getting_tested="function_getting_tested",
                 iteration_id="0",
             ),
-            file_name="file_name",
+            file_name=Path("file_name"),
             did_pass=False,
             runtime=5,
             test_framework="unittest",
@@ -1029,3 +1033,24 @@ def raise_specific_exception():
 
     zero_division_exc3 = ZeroDivisionError("Different message")
     assert comparator(zero_division_exc1, zero_division_exc3)
+
+    assert comparator(..., ...)
+    assert comparator(Ellipsis, Ellipsis)
+
+    assert not comparator(..., None)
+
+    assert not comparator(Ellipsis, None)   
+
+    code7 = "a = 1 + 2"
+    module7 = ast.parse(code7)
+    for node in ast.walk(module7):
+       for child in ast.iter_child_nodes(node):
+         child.parent = node # type: ignore
+    module8 = copy.deepcopy(module7)
+    assert comparator(module7, module8)
+
+    code2 = "a = 1 + 3"
+
+    module2 = ast.parse(code2)
+
+    assert not comparator(module7, module2)