Move codeflash python code base to cli/

.gitignore

@@ -10,7 +10,7 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
+cli/dist/
 downloads/
 eggs/
 .eggs/

.idea/codeflash.iml

@@ -15,7 +15,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/py-backend/aiservice" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/django/aiservice" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.aider.ident.cache.v1" />
       <excludeFolder url="file://$MODULE_DIR$/.aider.tags.cache.v1" />
       <excludeFolder url="file://$MODULE_DIR$/.mypy_cache" />

cli/code_to_optimize/bubble_sort_deps.py

@@ -1,6 +1,7 @@
-from code_to_optimize.bubble_sort_dep1_helper import dep1_comparer
 from code_to_optimize.bubble_sort_dep2_swap import dep2_swap
 
+from cli.code_to_optimize.bubble_sort_dep1_helper import dep1_comparer
+
 
 def sorter_deps(arr):
     for i in range(len(arr)):

cli/code_to_optimize/tests/pytest/test_bubble_sort.py

@@ -1,4 +1,5 @@
-from code_to_optimize.bubble_sort import sorter
+from cli.code_to_optimize.bubble_sort import sorter
+
 
 def test_sort():
     input = [5, 4, 3, 2, 1, 0]

cli/code_to_optimize/tests/pytest/test_bubble_sort_in_class.py

@@ -1,4 +1,4 @@
-from code_to_optimize.bubble_sort import sorter
+from cli.code_to_optimize.bubble_sort import sorter
 
 
 class TestSorter:

cli/code_to_optimize/tests/pytest/test_pig_latin.py

@@ -1,5 +1,6 @@
 import pickle
-from code_to_optimize.pig_latin import pig_latin
+
+from cli.code_to_optimize.pig_latin import pig_latin
 
 
 def log_test_values(values, test_name):

cli/code_to_optimize/tests/unittest/test_bubble_sort.py

@@ -1,6 +1,6 @@
 import unittest
 
-from code_to_optimize.bubble_sort import sorter
+from cli.code_to_optimize.bubble_sort import sorter
 
 
 class TestPigLatin(unittest.TestCase):

cli/code_to_optimize/use_cosine_similarity_from_other_file.py

@@ -1,6 +1,6 @@
 from typing import Optional, List, Tuple
 
-from code_to_optimize.math_utils import cosine_similarity_top_k, Matrix
+from cli.code_to_optimize.math_utils import cosine_similarity_top_k, Matrix
 
 
 def use_cosine_similarity(

cli/codeflash/cli/cmd_init.py

@@ -4,11 +4,10 @@ import subprocess
 
 import click
 import tomlkit
-from git import Repo
-
 from codeflash.code_utils.env_utils import get_codeflash_api_key
 from codeflash.code_utils.git_utils import get_github_secrets_page_url
 from codeflash.version import __version__ as version
+from git import Repo
 
 CODEFLASH_POETRY_DEPENDENCY_VERSION = {
     "url": "https://www.dropbox.com/scl/fi/hslqspzk8r4v1wdima8u5/codeflash-0.4.1-py3-none-any.whl?rlkey=vcnk99vynz84uqombnujzhjec&dl=1"

cli/codeflash/discovery/functions_to_optimize.py

@@ -1,15 +1,15 @@
 import ast
-import libcst as cst
 import logging
 import os
 from _ast import ClassDef, FunctionDef, AsyncFunctionDef
-from libcst import CSTNode
-from pydantic.dataclasses import dataclass
 from typing import Dict, Optional, List, Tuple, Union
 
+import libcst as cst
 from codeflash.code_utils.code_utils import path_belongs_to_site_packages
 from codeflash.code_utils.git_utils import get_git_diff
 from codeflash.verification.verification_utils import TestConfig
+from libcst import CSTNode
+from pydantic.dataclasses import dataclass
 
 
 class ReturnStatementVisitor(cst.CSTVisitor):

cli/codeflash/main.py

@@ -6,7 +6,7 @@ logging.basicConfig(level=logging.INFO, stream=sys.stdout)
 from typing import List, Optional
 
 from codeflash.api import cfapi
-from codeflash.api.aiservice import optimize_python_code
+from cli.codeflash.api.aiservice import optimize_python_code
 from codeflash.cli.cmd_init import init_codeflash
 from codeflash.code_utils import env_utils
 from codeflash.code_utils.config_consts import (

cli/codeflash/optimization/function_context.py

@@ -4,12 +4,11 @@ from typing import List
 
 import jedi
 import tiktoken
-from jedi.api.classes import Name
-from pydantic.dataclasses import dataclass
-
 from codeflash.code_utils.code_extractor import get_code_no_skeleton, get_code
 from codeflash.code_utils.code_utils import path_belongs_to_site_packages
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
+from jedi.api.classes import Name
+from pydantic.dataclasses import dataclass
 
 
 def belongs_to_class(name: Name, class_name: str) -> bool:

cli/codeflash/tracing/tracer.py

@@ -6,11 +6,10 @@ import time
 from collections import defaultdict
 from typing import Any, Dict, List, Optional
 
-from codeflash.validation.validation_utils import get_test_file_path
-
 from codeflash.code_utils.code_utils import module_name_from_file_path
 from codeflash.code_utils.config_parser import parse_config_file
 from codeflash.tracing.replay_test import create_trace_replay_test
+from codeflash.validation.validation_utils import get_test_file_path
 
 
 class Tracer:

cli/codeflash/verification/comparator.py

@@ -1,5 +1,5 @@
-import math
 import datetime
+import math
 from typing import Any
 
 try:

cli/codeflash/verification/parse_test_output.py

@@ -1,12 +1,10 @@
-from collections import defaultdict
-
 import logging
 import os
 import pickle
 import re
 import sqlite3
 import subprocess
-from junitparser.xunit2 import JUnitXml
+from collections import defaultdict
 from typing import Optional
 
 from codeflash.code_utils.code_utils import (
@@ -20,6 +18,7 @@ from codeflash.verification.test_results import (
     InvocationId,
 )
 from codeflash.verification.verification_utils import TestConfig
+from junitparser.xunit2 import JUnitXml
 
 
 def parse_test_return_values_bin(

cli/codeflash/verification/verification_utils.py

@@ -1,5 +1,6 @@
 import ast
 import os
+
 from pydantic.dataclasses import dataclass
 
 

cli/codeflash/verification/verifier.py

@@ -1,7 +1,6 @@
 import ast
 import logging
 
-from codeflash.api.aiservice import generate_regression_tests
 from codeflash.code_utils.ast_unparser import ast_unparse
 from codeflash.code_utils.code_utils import get_run_tmp_file
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
@@ -11,6 +10,8 @@ from codeflash.optimization.function_context import Source
 from codeflash.verification.verification_utils import ModifyInspiredTests
 from codeflash.verification.verification_utils import delete_multiple_if_name_main
 
+from cli.codeflash.api.aiservice import generate_regression_tests
+
 
 def generate_tests(
     source_code_being_tested: str,

cli/tests/test_comparator.py

@@ -1,7 +1,8 @@
-import pytest
+import datetime
 
-from codeflash.verification.equivalence import compare_results
+import pytest
 from codeflash.verification.comparator import comparator
+from codeflash.verification.equivalence import compare_results
 from codeflash.verification.test_results import (
     TestResults,
     FunctionTestInvocation,
@@ -9,8 +10,6 @@ from codeflash.verification.test_results import (
     TestType,
 )
 
-import datetime
-
 
 def test_basic_python_objects():
     a = 5

cli/tests/test_get_code.py

@@ -1,7 +1,5 @@
 import tempfile
 
-import pytest
-
 from codeflash.code_utils.code_extractor import get_code
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize, FunctionParent
 

cli/tests/test_type_annotation_context.py

@@ -2,8 +2,6 @@ import pathlib
 from dataclasses import dataclass, field
 from typing import List
 
-import pytest
-
 from codeflash.code_utils.code_extractor import get_code
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
 from codeflash.optimization.function_context import (

django/aiservice/authapp/admin.py

@@ -0,0 +1 @@
+# Register your models here.

django/aiservice/authapp/tests.py

@@ -0,0 +1 @@
+# Create your tests here.

django/aiservice/authapp/views.py

@@ -0,0 +1 @@
+# Create your views here.

django/aiservice/optimizer/admin.py

@@ -0,0 +1 @@
+# Register your models here.

django/aiservice/optimizer/tests.py

@@ -0,0 +1 @@
+# Create your tests here.

django/aiservice/optimizer/views.py

@@ -0,0 +1 @@
+# Create your views here.

django/aiservice/testgen/admin.py

@@ -0,0 +1 @@
+# Register your models here.

django/aiservice/testgen/models.py

@@ -0,0 +1 @@
+# Create your models here.

django/aiservice/testgen/testgen.py

@@ -3,6 +3,7 @@
 import ast  # used for detecting whether generated Python code is valid
 import logging
 import os
+
 from dotenv import load_dotenv
 from ninja import NinjaAPI, Schema
 from openai import AsyncOpenAI