slight fixes

Author: alvin-r

codeflash/optimization/function_optimizer.py

@@ -823,14 +823,14 @@ def establish_original_code_baseline(
             test_env = os.environ.copy()
             test_env["CODEFLASH_TEST_ITERATION"] = "0"
             test_env["CODEFLASH_TRACER_DISABLE"] = "1"
+            test_env["CODEFLASH_LOOP_INDEX"] = "0"
             if "PYTHONPATH" not in test_env:
                 test_env["PYTHONPATH"] = str(self.args.project_root)
             else:
                 test_env["PYTHONPATH"] += os.pathsep + str(self.args.project_root)
 
             coverage_results = None
             # Instrument codeflash capture
-            original_fto_code = Path(self.function_to_optimize.file_path).read_text("utf-8")
             try:
                 instrument_codeflash_capture(
                     self.function_to_optimize, file_path_to_helper_classes, self.test_cfg.tests_root
@@ -847,7 +847,7 @@ def establish_original_code_baseline(
             finally:
                 # Remove codeflash capture
                 self.write_code_and_helpers(
-                    original_fto_code, original_helper_code, self.function_to_optimize.file_path
+                    self.function_to_optimize_source_code, original_helper_code, self.function_to_optimize.file_path
                 )
             if not behavioral_results:
                 logger.warning(
@@ -949,6 +949,7 @@ def run_optimized_candidate(
 
         with progress_bar("Testing optimization candidate"):
             test_env = os.environ.copy()
+            test_env["CODEFLASH_LOOP_INDEX"] = "0"
             test_env["CODEFLASH_TEST_ITERATION"] = str(optimization_candidate_index)
             test_env["CODEFLASH_TRACER_DISABLE"] = "1"
             if "PYTHONPATH" not in test_env:
@@ -1103,8 +1104,8 @@ def run_and_parse_tests(
             logger.debug(
                 f'Nonzero return code {run_result.returncode} when running tests in '
                 f'{", ".join([str(f.instrumented_behavior_file_path) for f in test_files.test_files])}.\n'
-                # f"stdout: {run_result.stdout}\n"
-                # f"stderr: {run_result.stderr}\n"
+                f"stdout: {run_result.stdout}\n"
+                f"stderr: {run_result.stderr}\n"
             )
 
         results, coverage_results = parse_test_results(

codeflash/optimization/optimizer.py

@@ -45,8 +45,6 @@ def __init__(self, args: Namespace) -> None:
         self.experiment_id = os.getenv("CODEFLASH_EXPERIMENT_ID", None)
         self.local_aiservice_client = LocalAiServiceClient() if self.experiment_id else None
 
-        self.test_files = TestFiles(test_files=[])
-
     def create_function_optimizer(
         self,
         function_to_optimize: FunctionToOptimize,

codeflash/verification/test_results.py

@@ -168,7 +168,7 @@ def usable_runtime_data_by_test_case(self) -> dict[InvocationId, list[int]]:
         for result in self.test_results:
             if result.did_pass and not result.runtime:
                 logger.debug(
-                    f"Ignoring test case that passed but had no runtime -> {result.id}, Loop # {result.loop_index}"
+                    f"Ignoring test case that passed but had no runtime -> {result.id}, Loop # {result.loop_index}, Test Type: {result.test_type}, Verification Type: {result.verification_type}"
                 )
         usable_runtimes = [
             (result.id, result.runtime) for result in self.test_results if result.did_pass and result.runtime

codeflash/verification/test_runner.py

@@ -87,20 +87,25 @@ def run_behavioral_tests(
                 env=pytest_test_env,
                 timeout=600,
             )
-            logger.debug(results)
+            logger.debug(
+                f"""Result return code: {results.returncode}, {"Result stderr:" + str(results.stderr) if results.stderr else ''}""")
         else:
             results = execute_test_subprocess(
                 pytest_cmd_list + common_pytest_args + result_args + test_files,
                 cwd=cwd,
                 env=pytest_test_env,
                 timeout=600,  # TODO: Make this dynamic
             )
+            logger.debug(
+                f"""Result return code: {results.returncode}, {"Result stderr:" + str(results.stderr) if results.stderr else ''}""")
     elif test_framework == "unittest":
         if enable_coverage:
             raise ValueError("Coverage is not supported yet for unittest framework")
         test_env["CODEFLASH_LOOP_INDEX"] = "1"
         test_files = [file.instrumented_behavior_file_path for file in test_paths.test_files]
         result_file_path, results = run_unittest_tests(verbose, test_files, test_env, cwd)
+        logger.debug(
+            f"""Result return code: {results.returncode}, {"Result stderr:" + str(results.stderr) if results.stderr else ''}""")
     else:
         raise ValueError(f"Unsupported test framework: {test_framework}")