Merge pull request #15 from Codeplain-ai/deploy-conformance-tests-git

Conformance tests git

Author: tjazerzen

examples/example_hello_world_golang/config.yaml

@@ -1,4 +1,3 @@
 verbose: true
-debug: true
 unittests-script: ../../test_scripts/run_unittests_golang.sh
 conformance-tests-script: ../../test_scripts/run_conformance_tests_golang.sh

examples/example_hello_world_python/config.yaml

@@ -1,4 +1,3 @@
 unittests-script: ../../test_scripts/run_unittests_python.sh
 conformance-tests-script: ../../test_scripts/run_conformance_tests_python.sh
-v: true  # verbose flag, defaults to false if not set
-debug: true  # debug flag, defaults to false if not set
+verbose: true  # verbose flag, defaults to false if not set

file_utils.py

@@ -85,10 +85,9 @@ def list_folders_in_directory(directory):
     return folders
 
 
-def delete_files_and_subfolders(directory, debug=False):
+def delete_files_and_subfolders(directory):
     total_files_deleted = 0
     total_folders_deleted = 0
-    items_deleted = []
 
     # Walk the directory in reverse order (bottom-up)
     for root, dirs, files in os.walk(directory, topdown=False):
@@ -97,25 +96,12 @@ def delete_files_and_subfolders(directory, debug=False):
             file_path = os.path.join(root, file)
             os.remove(file_path)
             total_files_deleted += 1
-            if debug and len(items_deleted) < 10:
-                items_deleted.append(f"Deleted file: {file_path}")
 
         # Delete directories
         for dir_ in dirs:
             dir_path = os.path.join(root, dir_)
             os.rmdir(dir_path)
             total_folders_deleted += 1
-            if debug and len(items_deleted) < 10:
-                items_deleted.append(f"Deleted folder: {dir_path}")
-
-    # Print the results
-    if debug:
-        if total_files_deleted + total_folders_deleted > 10:
-            print(f"Total files deleted: {total_files_deleted}")
-            print(f"Total folders deleted: {total_folders_deleted}")
-        else:
-            for item in items_deleted:
-                print(item)
 
 
 def copy_file(source_path, destination_path):
@@ -255,16 +241,6 @@ def get_loaded_templates(source_path, plain_source):
     return plain_source, liquid_loader.loaded_templates
 
 
-def copy_unchanged_files_from_previous_build(
-    previous_build_folder, build_folder, existing_files, response_files, debug
-):
-    for file_name in existing_files:
-        if file_name not in response_files:
-            if debug:
-                print("Copying file: ", file_name)
-            copy_file(os.path.join(previous_build_folder, file_name), os.path.join(build_folder, file_name))
-
-
 def update_build_folder_with_rendered_files(build_folder, existing_files, response_files):
     changed_files = set()
     changed_files.update(response_files.keys())

git_utils.py

@@ -1,31 +1,61 @@
+import os
+from typing import Union
+
 from git import Repo
 
+import file_utils
+
 RENDERED_FRID_MESSAGE = "Changes related to Functional requirement ID (FRID): {}"
+RENDER_ID_MESSAGE = "Render ID: {}"
 BASE_FOLDER_COMMIT_MESSAGE = "Initialize build with Base Folder content"
+REFACTORED_CODE_COMMIT_MESSAGE = "Refactored code after implementing {}"
+CONFORMANCE_TESTS_PASSED_COMMIT_MESSAGE = (
+    "Fixed issues in the implementation code identified during conformance testing"
+)
+FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE = "Functional requirement ID (FRID): {} fully implemented"
 
 # The commit hash of the empty tree
 EMPTY_TREE_COMMIT_HASH = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
 
 
-def init_clean_repo(repo_path):
-    """Initializes a new git repository in the given path."""
-    repo = Repo.init(repo_path)
+def init_git_repo(path_to_repo: Union[str, os.PathLike]) -> Repo:
+    """
+    Initializes a new git repository in the given path.
+    If folder does not exist, it creates it.
+    If the folder already exists, it deletes the content of the folder.
+    """
+    if os.path.isdir(path_to_repo):
+        file_utils.delete_files_and_subfolders(path_to_repo)
+    else:
+        os.makedirs(path_to_repo)
+
+    repo = Repo.init(path_to_repo)
 
     return repo
 
 
-def is_dirty(repo_path):
+def is_dirty(repo_path: Union[str, os.PathLike]) -> bool:
     """Checks if the repository is dirty."""
     repo = Repo(repo_path)
     return repo.is_dirty(untracked_files=True)
 
 
-def add_all_files_and_commit(repo_path, commit_message, frid):
+def add_all_files_and_commit(
+    repo_path: Union[str, os.PathLike], commit_message: str, frid: str = None, render_id: str = None
+) -> Repo:
     """Adds all files to the git repository and commits them."""
     repo = Repo(repo_path)
     repo.git.add(".")
 
-    message = f"{commit_message}\n\n{RENDERED_FRID_MESSAGE.format(frid)}" if frid else commit_message
+    message = f"{commit_message}"
+
+    if frid or render_id:
+        message += "\n\n" + "-" * 80
+
+    if frid:
+        message += f"\n\n{RENDERED_FRID_MESSAGE.format(frid)}"
+    if render_id:
+        message += f"\n\n{RENDER_ID_MESSAGE.format(render_id)}"
 
     # Check if there are any changes to commit
     if not repo.is_dirty(untracked_files=True):
@@ -36,15 +66,15 @@ def add_all_files_and_commit(repo_path, commit_message, frid):
     return repo
 
 
-def revert_changes(repo_path):
+def revert_changes(repo_path: Union[str, os.PathLike]) -> Repo:
     """Reverts all changes made since the last commit."""
     repo = Repo(repo_path)
     repo.git.reset("--hard")
     repo.git.clean("-xdf")
     return repo
 
 
-def revert_to_commit_with_frid(repo_path, frid):
+def revert_to_commit_with_frid(repo_path: Union[str, os.PathLike], frid: str) -> Repo:
     """Finds commit with given frid mentioned in the commit message and reverts the branch to it."""
     repo = Repo(repo_path)
     commit = _get_commit_with_frid(repo, frid)
@@ -53,15 +83,16 @@ def revert_to_commit_with_frid(repo_path, frid):
     return repo
 
 
-def diff(repo_path, previous_frid=None):
+def diff(repo_path: Union[str, os.PathLike], previous_frid: str = None) -> dict:
     """
     Get the git diff between the current code state and the previous frid using git's native diff command.
     If previous_frid is not provided, we try to find the commit related to the copy of the base folder.
     Removes the 'diff --git' and 'index' lines to get clean unified diff format.
 
 
     Args:
-        repo_path (str): Path to the git repository
+        repo_path (str | os.PathLike): Path to the git repository
+        previous_frid (str): Functional requirement ID (FRID) of the previous commit
 
     Returns:
         dict: Dictionary with file names as keys and their clean diff strings as values
@@ -134,14 +165,18 @@ def diff(repo_path, previous_frid=None):
     return diff_dict
 
 
-def _get_commit_with_frid(repo, frid):
+def _get_commit_with_frid(repo: Repo, frid: str) -> str:
     """Finds commit with given frid mentioned in the commit message."""
-    commit = repo.git.rev_list("main", "--grep", RENDERED_FRID_MESSAGE.format(frid), "-n", "1")
+    current_branch = repo.active_branch.name
+    commit = repo.git.rev_list(
+        current_branch, "--grep", FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format(frid), "-n", "1"
+    )
     if not commit:
         raise Exception(f"No commit with frid {frid} found.")
     return commit
 
 
-def _get_base_folder_commit(repo):
+def _get_base_folder_commit(repo: Repo) -> str:
     """Finds commit related to copy of the base folder."""
-    return repo.git.rev_list("main", "--grep", BASE_FOLDER_COMMIT_MESSAGE, "-n", "1")
+    current_branch = repo.active_branch.name
+    return repo.git.rev_list(current_branch, "--grep", BASE_FOLDER_COMMIT_MESSAGE, "-n", "1")