logging done, start experimenting, using diff instead of raw strings

Author: aseembits93

codeflash/api/aiservice.py

@@ -11,10 +11,13 @@
 from pydantic.json import pydantic_encoder
 
 from codeflash.cli_cmds.console import console, logger
+from codeflash.code_utils.code_replacer import is_zero_diff
+from codeflash.code_utils.code_utils import unified_diff_strings
 from codeflash.code_utils.config_consts import N_CANDIDATES_EFFECTIVE, N_CANDIDATES_LP_EFFECTIVE
 from codeflash.code_utils.env_utils import get_codeflash_api_key
 from codeflash.code_utils.git_utils import get_last_commit_author_if_pr_exists, get_repo_owner_and_name
 from codeflash.code_utils.time_utils import humanize_runtime
+from codeflash.github.PrComment import FileDiffContent
 from codeflash.lsp.helpers import is_LSP_enabled
 from codeflash.models.ExperimentMetadata import ExperimentMetadata
 from codeflash.models.models import AIServiceRefinerRequest, CodeStringsMarkdown, OptimizedCandidate
@@ -529,8 +532,6 @@ def get_optimization_impact(
         replay_tests: str,
         concolic_tests: str,
         root_dir: Path,
-        original_line_profiler_results: str,
-        optimized_line_profiler_results: str,
     ) -> str:
         """Optimize the given python code for performance by making a request to the Django endpoint.
 
@@ -553,34 +554,22 @@ def get_optimization_impact(
         - 'high','medium' or 'low' optimization impact
 
         """
+        diff_str = '\n'.join([unified_diff_strings(code1=original_code[p], code2=new_code[p], fromfile=Path(p).relative_to(root_dir).as_posix(), tofile=Path(p).relative_to(root_dir).as_posix()) for p in original_code if not is_zero_diff(original_code[p], new_code[p])])
+        code_diff = f"```diff\n{diff_str}\n```"
         logger.info("!lsp|Computing Optimization Impact…")
-        original_code_str = ""
-        new_code_str = ""
-        for p, code in original_code.items():
-            original_code_str += f"```python:{Path(p).relative_to(root_dir).as_posix()}"
-            original_code_str += "\n"
-            original_code_str += code
-        for p, code in new_code.items():
-            new_code_str += f"```python:{Path(p).relative_to(root_dir).as_posix()}"
-            new_code_str += "\n"
-            new_code_str += code
-
         payload = {
-            "original_code": original_code_str,
-            "optimized_code": new_code_str,
+            "code_diff": code_diff,
             "existing_tests": existing_tests_source,
             "generated_tests": generated_original_test_source,
             "trace_id": function_trace_id,
             "coverage_message": coverage_message,
             "replay_tests": replay_tests,
             "concolic_tests": concolic_tests,
-            "speedup": f"{1 + float(explanation.speedup):.2f}x",
+            "speedup": f"{100 + 100*float(explanation.speedup):.2f}%",
             "loop_count": explanation.winning_benchmarking_test_results.number_of_loops(),
             "benchmark_details": explanation.benchmark_details if explanation.benchmark_details else None,
             "optimized_runtime": humanize_runtime(explanation.best_runtime_ns),
             "original_runtime": humanize_runtime(explanation.original_runtime_ns),
-            "original_line_profiler_results": original_line_profiler_results,
-            "optimized_line_profiler_results": optimized_line_profiler_results,
         }
         console.rule()
         try:

codeflash/optimization/function_optimizer.py

@@ -1406,25 +1406,22 @@ def process_review(
         }
 
         raise_pr = not self.args.no_pr
+        staging_review = self.args.staging_review
 
-        if raise_pr or self.args.staging_review:
+        if raise_pr or staging_review:
             data["root_dir"] = git_root_dir()
-
-        if raise_pr:
             # modify argument of staging vs pr based on the impact
             opt_impact_response = self.aiservice_client.get_optimization_impact(
                 **data,
-                original_line_profiler_results=original_code_baseline.line_profile_results["str_out"],
-                optimized_line_profiler_results=best_optimization.line_profiler_test_results["str_out"],
             )
-            if opt_impact_response in ["low", "medium"]:
+            if opt_impact_response=='low':
                 raise_pr = False
-                self.args.staging_review = True
+                staging_review = True
 
-        if raise_pr and not self.args.staging_review:
+        if raise_pr and not staging_review:
             data["git_remote"] = self.args.git_remote
             check_create_pr(**data)
-        elif self.args.staging_review:
+        elif staging_review:
             response = create_staging(**data)
             if response.status_code == 200:
                 staging_url = f"https://app.codeflash.ai/review-optimizations/{self.function_trace_id[:-4] + exp_type if self.experiment_id else self.function_trace_id}"
@@ -1463,7 +1460,7 @@ def process_review(
             self.revert_code_and_helpers(original_helper_code)
             return
 
-        if self.args.staging_review:
+        if staging_review:
             # always revert code and helpers when staging review
             self.revert_code_and_helpers(original_helper_code)
             return