linting mypy fixes

Author: aseembits93

codeflash/code_utils/edit_generated_tests.py

@@ -159,19 +159,10 @@ def leave_SimpleStatementLine(
                     if invocation_id.test_class_name
                     else invocation_id.test_function_name
                 )
-                rel_path = (
-                    Path(invocation_id.test_module_path.replace(".", os.sep))
-                    .with_suffix(".py")
-                    .resolve()
-                    .relative_to(self.tests_root)
-                )
+                abs_path = Path(invocation_id.test_module_path.replace(".", os.sep)).with_suffix(".py").resolve()
                 if (
                     qualified_name == ".".join(self.context_stack)
-                    and rel_path
-                    in [
-                        self.test.behavior_file_path.relative_to(self.tests_root),
-                        self.test.perf_file_path.relative_to(self.tests_root),
-                    ]
+                    and abs_path in [self.test.behavior_file_path, self.test.perf_file_path]
                     and int(invocation_id.iteration_id.split("_")[0]) == self.cfo_locs[self.cfo_idx_loc_to_look_at]  # type:ignore[union-attr]
                 ):
                     matching_original_times.extend(runtimes)
@@ -183,19 +174,10 @@ def leave_SimpleStatementLine(
                     if invocation_id.test_class_name
                     else invocation_id.test_function_name
                 )
-                rel_path = (
-                    Path(invocation_id.test_module_path.replace(".", os.sep))
-                    .with_suffix(".py")
-                    .resolve()
-                    .relative_to(self.tests_root)
-                )
+                abs_path = Path(invocation_id.test_module_path.replace(".", os.sep)).with_suffix(".py").resolve()
                 if (
                     qualified_name == ".".join(self.context_stack)
-                    and rel_path
-                    in [
-                        self.test.behavior_file_path.relative_to(self.tests_root),
-                        self.test.perf_file_path.relative_to(self.tests_root),
-                    ]
+                    and abs_path in [self.test.behavior_file_path, self.test.perf_file_path]
                     and int(invocation_id.iteration_id.split("_")[0]) == self.cfo_locs[self.cfo_idx_loc_to_look_at]  # type:ignore[union-attr]
                 ):
                     matching_optimized_times.extend(runtimes)

codeflash/result/create_pr.py

@@ -46,40 +46,35 @@ def existing_tests_source_for(
     optimized_tests_to_runtimes: dict[Path, dict[str, int]] = {}
     non_generated_tests = set()
     for test_file in test_files:
-        non_generated_tests.add(Path(test_file.tests_in_file.test_file).relative_to(tests_root))
+        non_generated_tests.add(test_file.tests_in_file.test_file)
     # TODO confirm that original and optimized have the same keys
     all_invocation_ids = original_runtimes_all.keys() | optimized_runtimes_all.keys()
     for invocation_id in all_invocation_ids:
-        rel_path = (
-            Path(invocation_id.test_module_path.replace(".", os.sep))
-            .with_suffix(".py")
-            .resolve()
-            .relative_to(tests_root)
-        )
-        if rel_path not in non_generated_tests:
+        abs_path = Path(invocation_id.test_module_path.replace(".", os.sep)).with_suffix(".py").resolve()
+        if abs_path not in non_generated_tests:
             continue
-        if rel_path not in original_tests_to_runtimes:
-            original_tests_to_runtimes[rel_path] = {}
-        if rel_path not in optimized_tests_to_runtimes:
-            optimized_tests_to_runtimes[rel_path] = {}
+        if abs_path not in original_tests_to_runtimes:
+            original_tests_to_runtimes[abs_path] = {}
+        if abs_path not in optimized_tests_to_runtimes:
+            optimized_tests_to_runtimes[abs_path] = {}
         qualified_name = (
             invocation_id.test_class_name + "." + invocation_id.test_function_name  # type: ignore[operator]
             if invocation_id.test_class_name
             else invocation_id.test_function_name
         )
-        if qualified_name not in original_tests_to_runtimes[rel_path]:
-            original_tests_to_runtimes[rel_path][qualified_name] = 0  # type: ignore[index]
-        if qualified_name not in optimized_tests_to_runtimes[rel_path]:
-            optimized_tests_to_runtimes[rel_path][qualified_name] = 0  # type: ignore[index]
+        if qualified_name not in original_tests_to_runtimes[abs_path]:
+            original_tests_to_runtimes[abs_path][qualified_name] = 0  # type: ignore[index]
+        if qualified_name not in optimized_tests_to_runtimes[abs_path]:
+            optimized_tests_to_runtimes[abs_path][qualified_name] = 0  # type: ignore[index]
         if invocation_id in original_runtimes_all:
-            original_tests_to_runtimes[rel_path][qualified_name] += min(original_runtimes_all[invocation_id])  # type: ignore[index]
+            original_tests_to_runtimes[abs_path][qualified_name] += min(original_runtimes_all[invocation_id])  # type: ignore[index]
         if invocation_id in optimized_runtimes_all:
-            optimized_tests_to_runtimes[rel_path][qualified_name] += min(optimized_runtimes_all[invocation_id])  # type: ignore[index]
+            optimized_tests_to_runtimes[abs_path][qualified_name] += min(optimized_runtimes_all[invocation_id])  # type: ignore[index]
     # parse into string
-    all_rel_paths = (
+    all_abs_paths = (
         original_tests_to_runtimes.keys()
     )  # both will have the same keys as some default values are assigned in the previous loop
-    for filename in sorted(all_rel_paths):
+    for filename in sorted(all_abs_paths):
         all_qualified_names = original_tests_to_runtimes[
             filename
         ].keys()  # both will have the same keys as some default values are assigned in the previous loop
@@ -91,6 +86,7 @@ def existing_tests_source_for(
             ):
                 print_optimized_runtime = format_time(optimized_tests_to_runtimes[filename][qualified_name])
                 print_original_runtime = format_time(original_tests_to_runtimes[filename][qualified_name])
+                print_filename = filename.relative_to(tests_root)
                 greater = (
                     optimized_tests_to_runtimes[filename][qualified_name]
                     > original_tests_to_runtimes[filename][qualified_name]
@@ -105,7 +101,7 @@ def existing_tests_source_for(
                 if greater:
                     rows.append(
                         [
-                            f"`{filename}::{qualified_name}`",
+                            f"`{print_filename}::{qualified_name}`",
                             f"{print_original_runtime}",
                             f"{print_optimized_runtime}",
                             f"⚠️{perf_gain}%",
@@ -114,7 +110,7 @@ def existing_tests_source_for(
                 else:
                     rows.append(
                         [
-                            f"`{filename}::{qualified_name}`",
+                            f"`{print_filename}::{qualified_name}`",
                             f"{print_original_runtime}",
                             f"{print_optimized_runtime}",
                             f"✅{perf_gain}%",