Merge branch 'main' into trace-and-optimize

Author: KRRT7

codeflash/code_utils/shell_utils.py

@@ -15,7 +15,7 @@
     SHELL_RC_EXPORT_PATTERN = re.compile(r"^set CODEFLASH_API_KEY=(cf-.*)$", re.MULTILINE)
     SHELL_RC_EXPORT_PREFIX = "set CODEFLASH_API_KEY="
 else:
-    SHELL_RC_EXPORT_PATTERN = re.compile(r'^export CODEFLASH_API_KEY="?(cf-[^\s"]+)"?$', re.MULTILINE)
+    SHELL_RC_EXPORT_PATTERN = re.compile(r'^(?!#)export CODEFLASH_API_KEY=[\'"]?(cf-[^\s"]+)[\'"]$', re.MULTILINE)
     SHELL_RC_EXPORT_PREFIX = "export CODEFLASH_API_KEY="
 
 

codeflash/optimization/function_optimizer.py

@@ -1457,11 +1457,9 @@ def submit_test_generation_tasks(
         ]
 
     def cleanup_generated_files(self) -> None:
-        paths_to_cleanup = [self.test_cfg.concolic_test_root_dir]
+        paths_to_cleanup = []
         for test_file in self.test_files:
             paths_to_cleanup.append(test_file.instrumented_behavior_file_path)
             paths_to_cleanup.append(test_file.benchmarking_file_path)
 
         cleanup_paths(paths_to_cleanup)
-        if hasattr(get_run_tmp_file, "tmpdir"):
-            get_run_tmp_file.tmpdir.cleanup()

codeflash/optimization/optimizer.py

@@ -12,7 +12,7 @@
 from codeflash.api.aiservice import AiServiceClient, LocalAiServiceClient
 from codeflash.cli_cmds.console import console, logger, progress_bar
 from codeflash.code_utils import env_utils
-from codeflash.code_utils.code_utils import cleanup_paths
+from codeflash.code_utils.code_utils import cleanup_paths, get_run_tmp_file
 from codeflash.code_utils.env_utils import get_pr_number
 from codeflash.either import is_successful
 from codeflash.models.models import ValidCode
@@ -289,31 +289,36 @@ def run(self) -> None:
                         f"{function_to_optimize.qualified_name}"
                     )
                     console.rule()
+                    function_optimizer = None
+                    try:
+                        function_optimizer = self.create_function_optimizer(
+                            function_to_optimize,
+                            function_to_tests=function_to_tests,
+                            function_to_optimize_source_code=validated_original_code[original_module_path].source_code,
+                            function_benchmark_timings=function_benchmark_timings,
+                            total_benchmark_timings=total_benchmark_timings,
+                            original_module_ast=original_module_ast,
+                            original_module_path=original_module_path,
+                        )
 
-                    function_optimizer = self.create_function_optimizer(
-                        function_to_optimize,
-                        function_to_tests=function_to_tests,
-                        function_to_optimize_source_code=validated_original_code[original_module_path].source_code,
-                        function_benchmark_timings=function_benchmark_timings,
-                        total_benchmark_timings=total_benchmark_timings,
-                        original_module_ast=original_module_ast,
-                        original_module_path=original_module_path,
-                    )
-
-                    self.current_function_optimizer = (
-                        function_optimizer  # needed to clean up from the outside of this function
-                    )
-                    best_optimization = function_optimizer.optimize_function()
-                    if self.functions_checkpoint:
-                        self.functions_checkpoint.add_function_to_checkpoint(
-                            function_to_optimize.qualified_name_with_modules_from_root(self.args.project_root)
+                        self.current_function_optimizer = (
+                            function_optimizer  # needed to clean up from the outside of this function
                         )
-                    if is_successful(best_optimization):
-                        optimizations_found += 1
-                    else:
-                        logger.warning(best_optimization.failure())
-                        console.rule()
-                        continue
+                        best_optimization = function_optimizer.optimize_function()
+                        if self.functions_checkpoint:
+                            self.functions_checkpoint.add_function_to_checkpoint(
+                                function_to_optimize.qualified_name_with_modules_from_root(self.args.project_root)
+                            )
+                        if is_successful(best_optimization):
+                            optimizations_found += 1
+                        else:
+                            logger.warning(best_optimization.failure())
+                            console.rule()
+                            continue
+                    finally:
+                        if function_optimizer is not None:
+                            function_optimizer.cleanup_generated_files()
+
             ph("cli-optimize-run-finished", {"optimizations_found": optimizations_found})
             if self.functions_checkpoint:
                 self.functions_checkpoint.cleanup()
@@ -351,6 +356,9 @@ def cleanup_temporary_paths(self) -> None:
         if self.current_function_optimizer:
             self.current_function_optimizer.cleanup_generated_files()
 
+        if hasattr(get_run_tmp_file, "tmpdir"):
+            get_run_tmp_file.tmpdir.cleanup()
+            del get_run_tmp_file.tmpdir
         cleanup_paths([self.test_cfg.concolic_test_root_dir, self.replay_tests_dir])
 
 

codeflash/telemetry/posthog_cf.py

@@ -7,7 +7,7 @@
 
 from codeflash.api.cfapi import get_user_id
 from codeflash.cli_cmds.console import logger
-from codeflash.version import __version__, __version_tuple__
+from codeflash.version import __version__
 
 _posthog = None
 
@@ -36,7 +36,7 @@ def ph(event: str, properties: dict[str, Any] | None = None) -> None:
         return
 
     properties = properties or {}
-    properties.update({"cli_version": __version__, "cli_version_tuple": __version_tuple__})
+    properties.update({"cli_version": __version__})
 
     user_id = get_user_id()
 

codeflash/update_license_version.py

@@ -2,15 +2,15 @@
 from datetime import datetime
 from pathlib import Path
 
-from version import __version_tuple__
+from .version import __version__
 
 
 def main() -> None:
     # Use the version tuple from version.py
-    version = __version_tuple__
+    version = __version__
 
     # Use the major and minor version components from the version tuple
-    major_minor_version = ".".join(map(str, version[:2]))
+    major_minor_version = ".".join(map(str, version.split(".")[:2]))
 
     # Define the pattern to search for and the replacement string for the version
     version_pattern = re.compile(r"(Licensed Work:\s+Codeflash Client version\s+)(0\.\d+)(\.x)")

codeflash/version.py

@@ -1,3 +1,2 @@
 # These version placeholders will be replaced by uv-dynamic-versioning during build.
-__version__ = "0.14.6"
-__version_tuple__ = (0, 14, 6)
+__version__ = "0.14.7"

pyproject.toml

@@ -268,17 +268,17 @@ enable = true
 style = "pep440"
 vcs = "git"
 
-[tool.uv-dynamic-versioning.substitution]
-files = ["codeflash/version.py"]
-
-[tool.uv-dynamic-versioning.files."codeflash/version.py"]
-persistent-substitution = true
-initial-content = """
-  # These version placeholders will be replaced by uv-dynamic-versioning during build.
-  __version__ = "0.0.0"
-  __version_tuple__ = (0, 0, 0)
+[tool.hatch.build.hooks.version]
+path = "codeflash/version.py"
+template = """# These version placeholders will be replaced by uv-dynamic-versioning during build.
+__version__ = "{version}"
 """
 
+
+#[tool.hatch.build.hooks.custom]
+#path = "codeflash/update_license_version.py"
+
+
 [tool.codeflash]
 module-root = "codeflash"
 tests-root = "tests"

tests/test_shell_utils.py

@@ -54,6 +54,16 @@ def test_valid_api_key(self):
             ) as mock_file:
                 self.assertEqual(read_api_key_from_shell_config(), self.api_key)
                 mock_file.assert_called_once_with(self.test_rc_path, encoding="utf8")
+            with patch(
+                "builtins.open", mock_open(read_data=f'export CODEFLASH_API_KEY=\'{self.api_key}\'\n')
+            ) as mock_file:
+                self.assertEqual(read_api_key_from_shell_config(), self.api_key)
+                mock_file.assert_called_once_with(self.test_rc_path, encoding="utf8")
+            with patch(
+                "builtins.open", mock_open(read_data=f'#export CODEFLASH_API_KEY=\'{self.api_key}\'\n')
+            ) as mock_file:
+                self.assertEqual(read_api_key_from_shell_config(), None)
+                mock_file.assert_called_once_with(self.test_rc_path, encoding="utf8")
 
     @patch("codeflash.code_utils.shell_utils.get_shell_rc_path")
     def test_no_api_key(self, mock_get_shell_rc_path):