codeflash 0.7.2__tar.gz → 0.7.3__tar.gz

{codeflash-0.7.2 → codeflash-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeflash
-Version: 0.7.2
+Version: 0.7.3
 Summary: Client for codeflash.ai - automatic code performance optimization, powered by AI
 Home-page: https://codeflash.ai
 License: BSL-1.1

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/cli_cmds/cli.py

@@ -170,6 +170,7 @@ def process_pyproject_config(args: Namespace) -> Namespace:
     # in this case, the ".." becomes outside project scope, causing issues with un-importable paths
     args.project_root = project_root_from_module_root(args.module_root, pyproject_file_path)
     args.tests_root = Path(args.tests_root).resolve()
+    args.test_project_root = project_root_from_module_root(args.tests_root, pyproject_file_path)
     return handle_optimize_all_arg_parsing(args)
 
 

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/code_utils/instrument_existing_tests.py

@@ -323,7 +323,7 @@ def inject_profiling_into_existing_test(
     test_path: Path,
     call_positions: list[CodePosition],
     function_to_optimize: FunctionToOptimize,
-    root_path: Path,
+    tests_project_root: Path,
     test_framework: str,
 ) -> tuple[bool, str | None]:
     with test_path.open(encoding="utf8") as f:
@@ -334,12 +334,12 @@ def inject_profiling_into_existing_test(
         logger.exception(f"Syntax error in code in file - {test_path}")
         return False, None
     # TODO: Pass the full name of function here, otherwise we can run into namespace clashes
-    module_path = module_name_from_file_path(test_path, root_path)
+    test_module_path = module_name_from_file_path(test_path, tests_project_root)
     import_visitor = FunctionImportedAsVisitor(function_to_optimize)
     import_visitor.visit(tree)
     func = import_visitor.imported_as
 
-    tree = InjectPerfOnly(func, module_path, test_framework, call_positions).visit(tree)
+    tree = InjectPerfOnly(func, test_module_path, test_framework, call_positions).visit(tree)
     new_imports = [
         ast.Import(names=[ast.alias(name="time")]),
         ast.Import(names=[ast.alias(name="gc")]),

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/discovery/discover_unit_tests.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import os
 import re
+import sys
 import unittest
 from collections import defaultdict
 from multiprocessing import Process, Queue
@@ -65,11 +66,15 @@ def run_pytest_discovery_new_process(queue: Queue, cwd: str, tests_root: str) ->
 
     os.chdir(cwd)
     collected_tests = []
+    pytest_rootdir: Path | None = None
     tests: list[TestsInFile] = []
+    sys.path.insert(1, str(cwd))
 
     class PytestCollectionPlugin:
         def pytest_collection_finish(self, session) -> None:
+            nonlocal pytest_rootdir
             collected_tests.extend(session.items)
+            pytest_rootdir = Path(session.config.rootdir)
 
     try:
         exitcode = pytest.main(
@@ -79,9 +84,9 @@ def run_pytest_discovery_new_process(queue: Queue, cwd: str, tests_root: str) ->
     except Exception as e:
         logger.exception(f"Failed to collect tests: {e!s}")
         exitcode = -1
-        queue.put((exitcode, tests))
+        queue.put((exitcode, tests, pytest_rootdir))
     tests = parse_pytest_collection_results(collected_tests)
-    queue.put((exitcode, tests))
+    queue.put((exitcode, tests, pytest_rootdir))
 
 
 def parse_pytest_collection_results(
@@ -116,10 +121,15 @@ def discover_tests_pytest(
     q: Queue = Queue()
     p: Process = Process(target=run_pytest_discovery_new_process, args=(q, project_root, tests_root))
     p.start()
-    exitcode, tests = q.get()
+    exitcode, tests, pytest_rootdir = q.get()
     p.join()
-    logger.debug(f"Pytest collection exit code: {exitcode}")
 
+    if exitcode != 0:
+        logger.warning(f"Failed to collect tests. Pytest Exit code: {exitcode}")
+    else:
+        logger.debug(f"Pytest collection exit code: {exitcode}")
+    if pytest_rootdir is not None:
+        cfg.tests_project_rootdir = pytest_rootdir
     file_to_test_map = defaultdict(list)
     for test in tests:
         if discover_only_these_tests and test.test_file not in discover_only_these_tests:

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/optimization/optimizer.py

@@ -100,6 +100,7 @@ class Optimizer:
 
         self.test_cfg = TestConfig(
             tests_root=args.tests_root,
+            tests_project_rootdir=args.test_project_root,
             project_root_path=args.project_root,
             test_framework=args.test_framework,
             pytest_cmd=args.pytest_cmd,
@@ -751,11 +752,11 @@ class Optimizer:
                 path_obj_test_file = Path(test_file)
                 relevant_test_files_count += 1
                 success, injected_test = inject_profiling_into_existing_test(
-                    path_obj_test_file,
-                    positions,
-                    function_to_optimize,
-                    self.args.project_root,
-                    self.args.test_framework,
+                    test_path=path_obj_test_file,
+                    call_positions=positions,
+                    function_to_optimize=function_to_optimize,
+                    tests_project_root=self.test_cfg.tests_project_rootdir,
+                    test_framework=self.args.test_framework,
                 )
                 if not success:
                     continue

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/verification/parse_test_output.py

@@ -67,7 +67,7 @@ def parse_test_return_values_bin(
             invocation_id_object = InvocationId.from_str_id(encoded_test_name, invocation_id)
             test_file_path = file_path_from_module_name(
                 invocation_id_object.test_module_path,
-                test_config.project_root_path,
+                test_config.tests_project_rootdir,
             )
 
             test_type = test_files.get_test_type_by_instrumented_file_path(test_file_path)
@@ -111,7 +111,7 @@ def parse_sqlite_test_results(
     for val in data:
         try:
             test_module_path = val[0]
-            test_file_path = file_path_from_module_name(test_module_path, test_config.project_root_path)
+            test_file_path = file_path_from_module_name(test_module_path, test_config.tests_project_rootdir)
             # TODO : this is because sqlite writes original file module path. Should make it consistent
             test_type = test_files.get_test_type_by_original_file_path(test_file_path)
             loop_index = val[4]
@@ -159,7 +159,11 @@ def parse_test_xml(
             f"Failed to parse {test_xml_file_path} as JUnitXml. Exception: {e}",
         )
         return test_results
-
+    base_dir = (
+        test_config.tests_project_rootdir
+        if test_config.test_framework == "pytest"
+        else test_config.project_root_path
+    )
     for suite in xml:
         for testcase in suite:
             class_name = testcase.classname
@@ -173,9 +177,14 @@ def parse_test_xml(
                 # This means that the test failed to load, so we don't want to crash on it
                 logger.info("Test failed to load, skipping it.")
                 if run_result is not None:
-                    logger.info(
-                        f"Test log - STDOUT : {run_result.stdout.decode()} \n STDERR : {run_result.stderr.decode()}",
-                    )
+                    if isinstance(run_result.stdout, str) and isinstance(run_result.stderr, str):
+                        logger.info(
+                            f"Test log - STDOUT : {run_result.stdout} \n STDERR : {run_result.stderr}",
+                        )
+                    else:
+                        logger.info(
+                            f"Test log - STDOUT : {run_result.stdout.decode()} \n STDERR : {run_result.stderr.decode()}",
+                        )
                 return test_results
 
             test_class_path = testcase.classname
@@ -185,18 +194,22 @@ def parse_test_xml(
                     # TODO : This might not be true if the test is organized under a class
                     test_file_path = file_path_from_module_name(
                         test_class_path,
-                        test_config.project_root_path,
+                        base_dir,
                     )
                 else:
-                    test_file_path = file_path_from_module_name(test_function, test_config.project_root_path)
+                    test_file_path = file_path_from_module_name(
+                        test_function,
+                        base_dir,
+                    )
             else:
-                test_file_path = test_config.project_root_path / test_file_name
+                # TODO: not sure which root path fits better here
+                test_file_path = base_dir / test_file_name
             if not test_file_path.exists():
                 logger.warning(f"Could not find the test for file name - {test_file_path} ")
                 continue
             test_type = test_files.get_test_type_by_instrumented_file_path(test_file_path)
             assert test_type is not None, f"Test type not found for {test_file_path}"
-            test_module_path = module_name_from_file_path(test_file_path, test_config.project_root_path)
+            test_module_path = module_name_from_file_path(test_file_path, test_config.tests_project_rootdir)
             result = testcase.is_passed  # TODO: See for the cases of ERROR and SKIPPED
             test_class = None
             if class_name is not None and class_name.startswith(test_module_path):

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/verification/verification_utils.py

@@ -1,5 +1,4 @@
 import ast
-import os
 from pathlib import Path
 
 from pydantic.dataclasses import dataclass
@@ -67,9 +66,12 @@ class ModifyInspiredTests(ast.NodeTransformer):
         return node
 
 
-@dataclass(frozen=True)
+@dataclass
 class TestConfig:
     tests_root: Path
     project_root_path: Path
     test_framework: str
+    tests_project_rootdir: Path
+    # tests_project_rootdir corresponds to pytest rootdir,
+    # or for unittest - project_root_from_module_root(args.tests_root, pyproject_file_path)
     pytest_cmd: str = "pytest"

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/verification/verifier.py

@@ -38,7 +38,7 @@ def generate_tests(
         module = importlib.import_module(str(module_path))
         generated_test_source = module.CACHED_TESTS
         instrumented_test_source = module.CACHED_INSTRUMENTED_TESTS
-        temp_run_dir = get_run_tmp_file(Path(""))
+        temp_run_dir = get_run_tmp_file(Path())
         path = str(temp_run_dir).replace("\\", "\\\\")  # Escape backslash for windows paths
         instrumented_test_source = instrumented_test_source.replace(
             "{codeflash_run_tmp_dir_client_side}",
@@ -46,12 +46,8 @@ def generate_tests(
         )
         logger.info(f"Using cached tests from {module_path}.CACHED_TESTS")
     else:
-        test_module_path = Path(
-            module_name_from_file_path(
-                get_test_file_path(test_cfg.tests_root, function_to_optimize.function_name, 0),
-                test_cfg.project_root_path,
-            ),
-        )
+        test_file_path = get_test_file_path(test_cfg.tests_root, function_to_optimize.function_name, 0)
+        test_module_path = Path(module_name_from_file_path(test_file_path, test_cfg.tests_project_rootdir))
         response = aiservice_client.generate_regression_tests(
             source_code_being_tested=source_code_being_tested,
             function_to_optimize=function_to_optimize,
@@ -65,7 +61,7 @@ def generate_tests(
         )
         if response and isinstance(response, tuple) and len(response) == 2:
             generated_test_source, instrumented_test_source = response
-            temp_run_dir = get_run_tmp_file(Path(""))
+            temp_run_dir = get_run_tmp_file(Path())
             path = str(temp_run_dir).replace("\\", "\\\\")
             instrumented_test_source = instrumented_test_source.replace(
                 "{codeflash_run_tmp_dir_client_side}",
@@ -77,13 +73,6 @@ def generate_tests(
             )
             return None
 
-    # TODO: Add support for inspired tests
-    # inspired_unit_tests = ""
-
-    # merged_test_source = merge_unit_tests(
-    #     instrumented_test_source, inspired_unit_tests, test_cfg.test_framework
-    # )
-
     return generated_test_source, instrumented_test_source
 
 

{codeflash-0.7.2 → codeflash-0.7.3}/codeflash/version.py

@@ -1,3 +1,3 @@
 # These version placeholders will be replaced by poetry-dynamic-versioning during `poetry build`.
-__version__ = "0.7.2"
-__version_tuple__ = (0, 7, 2)
+__version__ = "0.7.3"
+__version_tuple__ = (0, 7, 3)

{codeflash-0.7.2 → codeflash-0.7.3}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "codeflash"
-version = "0.7.2" # Determined by poetry-dynamic-versioning during `poetry build`
+version = "0.7.3" # Determined by poetry-dynamic-versioning during `poetry build`
 description = "Client for codeflash.ai - automatic code performance optimization, powered by AI"
 license = "BSL-1.1"
 authors = ["CodeFlash Inc. <contact@codeflash.ai>"]