Merge branch 'windows-fixes' of https://github.com/codeflash-ai/codeflash into windows-fixes

Author: KRRT7

codeflash/code_utils/code_utils.py

@@ -9,6 +9,7 @@
 
 from codeflash.cli_cmds.console import logger
 
+_tmpdir = TemporaryDirectory(prefix="codeflash_")
 
 def get_qualified_name(module_name: str, full_qualified_name: str) -> str:
     if not full_qualified_name:
@@ -78,10 +79,12 @@ def get_all_function_names(code: str) -> tuple[bool, list[str]]:
     return True, function_names
 
 
-def get_run_tmp_file(file_path: Path) -> Path:
+def get_run_tmp_file(file_path: Path | str) -> Path:
     if not hasattr(get_run_tmp_file, "tmpdir"):
-        get_run_tmp_file.tmpdir = TemporaryDirectory(prefix="codeflash_")
-    return Path(get_run_tmp_file.tmpdir.name) / file_path
+        get_run_tmp_file.tmpdir = _tmpdir
+    if isinstance(file_path, str):
+        file_path = Path(file_path)
+    return (Path(get_run_tmp_file.tmpdir.name) / file_path).resolve()
 
 
 def path_belongs_to_site_packages(file_path: Path) -> bool:

codeflash/code_utils/coverage_utils.py

@@ -41,11 +41,11 @@ def build_fully_qualified_name(function_name: str, code_context: CodeOptimizatio
 
 def generate_candidates(source_code_path: Path) -> list[str]:
     """Generate all the possible candidates for coverage data based on the source code path."""
-    candidates = [source_code_path.name]
-    current_path = source_code_path.parent
+    candidates: list[str] = [source_code_path.name]
+    current_path: Path = source_code_path.parent
 
     while current_path != current_path.parent:
-        candidate_path = str(Path(current_path.name) / candidates[-1])
+        candidate_path = (Path(current_path.name) / candidates[-1]).as_posix()
         candidates.append(candidate_path)
         current_path = current_path.parent
 

codeflash/code_utils/instrument_existing_tests.py

@@ -212,7 +212,7 @@ def visit_FunctionDef(self, node: ast.FunctionDef, test_class_name: str | None =
                                     args=[
                                         ast.JoinedStr(
                                             values=[
-                                                ast.Constant(value=f"{get_run_tmp_file(Path('test_return_values_'))}"),
+                                                ast.Constant(value=get_run_tmp_file("test_return_values_").as_posix()),
                                                 ast.FormattedValue(
                                                     value=ast.Name(id="codeflash_iteration", ctx=ast.Load()),
                                                     conversion=-1,

codeflash/verification/instrument_codeflash_capture.py

@@ -30,9 +30,9 @@ def instrument_codeflash_capture(
     modified_code = add_codeflash_capture_to_init(
         target_classes={class_parent.name},
         fto_name=function_to_optimize.function_name,
-        tmp_dir_path=str(get_run_tmp_file(Path("test_return_values"))),
+        tmp_dir_path=get_run_tmp_file("test_return_values").as_posix(),
         code=original_code,
-        tests_root=tests_root,
+        tests_root=tests_root.as_posix(),
         is_fto=True,
     )
     function_to_optimize.file_path.write_text(modified_code, encoding="utf-8")
@@ -43,9 +43,9 @@ def instrument_codeflash_capture(
         modified_code = add_codeflash_capture_to_init(
             target_classes=helper_classes,
             fto_name=function_to_optimize.function_name,
-            tmp_dir_path=str(get_run_tmp_file(Path("test_return_values"))),
+            tmp_dir_path=get_run_tmp_file("test_return_values").as_posix(),
             code=original_code,
-            tests_root=tests_root,
+            tests_root=tests_root.as_posix(),
             is_fto=False,
         )
         file_path.write_text(modified_code, encoding="utf-8")

tests/test_code_context_extractor.py

@@ -356,10 +356,9 @@ def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R:
             lifespan=self.__duration__,
         )
 '''
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -368,7 +367,7 @@ def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R:
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -557,10 +556,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -569,7 +567,7 @@ def helper_method(self):
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -637,10 +635,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -649,7 +646,7 @@ def helper_method(self):
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -717,10 +714,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -729,7 +725,7 @@ def helper_method(self):
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -787,10 +783,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -838,10 +833,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -1272,10 +1266,9 @@ def target_method(self):
 def outside_method():
     return 1
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),