Merge branch 'main' into compile

Author: KRRT7

codeflash/verification/comparator.py

@@ -25,6 +25,25 @@
 HAS_XARRAY = find_spec("xarray") is not None
 HAS_TENSORFLOW = find_spec("tensorflow") is not None
 
+# Pattern to match pytest temp directories: /tmp/pytest-of-<user>/pytest-<N>/
+# These paths vary between test runs but are logically equivalent
+PYTEST_TEMP_PATH_PATTERN = re.compile(r"/tmp/pytest-of-[^/]+/pytest-\d+/")  # noqa: S108
+
+
+def _normalize_temp_path(path: str) -> str:
+    """Normalize temporary file paths by replacing session-specific components.
+
+    Pytest creates temp directories like /tmp/pytest-of-<user>/pytest-<N>/
+    where N is a session number that increments. When comparing return values
+    from different test runs, these paths should be considered equivalent.
+    """
+    return PYTEST_TEMP_PATH_PATTERN.sub("/tmp/pytest-temp/", path)  # noqa: S108
+
+
+def _is_temp_path(s: str) -> bool:
+    """Check if a string looks like a pytest temp path."""
+    return PYTEST_TEMP_PATH_PATTERN.search(s) is not None
+
 
 def _extract_exception_from_message(msg: str) -> Optional[BaseException]:  # noqa: FA100
     """Try to extract a wrapped exception type from an error message.
@@ -109,10 +128,18 @@ def comparator(orig: Any, new: Any, superset_obj=False) -> bool:  # noqa: ANN001
                 return False
             return all(comparator(elem1, elem2, superset_obj) for elem1, elem2 in zip(orig, new))
 
+        # Handle strings separately to normalize temp paths
+        if isinstance(orig, str):
+            if orig == new:
+                return True
+            # If strings differ, check if they're temp paths that differ only in session number
+            if _is_temp_path(orig) and _is_temp_path(new):
+                return _normalize_temp_path(orig) == _normalize_temp_path(new)
+            return False
+
         if isinstance(
             orig,
             (
-                str,
                 int,
                 bool,
                 complex,