Merge pull request #20 from Codeplain-ai/deploy/07-17

Add options to include destination folder for source and conformance test code

Author: tjazerzen

codeplain_REST_api.py

@@ -213,6 +213,7 @@ def fix_unittests_issue(
             "linked_resources": linked_resources,
             "existing_files_content": existing_files_content,
             "unittests_issue": unittests_issue,
+            "unittest_batch_id": run_state.unittest_batch_id,
         }
 
         return self.post_request(endpoint_url, headers, payload, run_state)

file_utils.py

@@ -250,12 +250,23 @@ def update_build_folder_with_rendered_files(build_folder, existing_files, respon
     return existing_files, changed_files
 
 
-def copy_folder_content(source_folder, destination_folder):
+def copy_folder_content(source_folder, destination_folder, ignore_folders=None):
     """
     Recursively copy all files and folders from source_folder to destination_folder.
     Uses shutil.copytree which handles all edge cases including permissions and symlinks.
+
+    Args:
+        source_folder: Source directory to copy from
+        destination_folder: Destination directory to copy to
+        ignore_folders: List of folder names to ignore during copy (default: empty list)
     """
-    shutil.copytree(source_folder, destination_folder, dirs_exist_ok=True)
+    if ignore_folders is None:
+        ignore_folders = []
+
+    ignore_func = (
+        (lambda dir, files: [f for f in files if f in ignore_folders]) if ignore_folders else None  # noqa: U100,U101
+    )
+    shutil.copytree(source_folder, destination_folder, dirs_exist_ok=True, ignore=ignore_func)
 
 
 def get_template_directories(plain_file_path, custom_template_dir=None, default_template_dir=None) -> list[str]:
@@ -281,3 +292,16 @@ def get_template_directories(plain_file_path, custom_template_dir=None, default_
         template_dirs.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), default_template_dir))
 
     return template_dirs
+
+
+def copy_folder_to_output(source_folder, output_folder):
+    """Copy source folder contents directly to the specified output folder."""
+    # Create output folder if it doesn't exist
+    os.makedirs(output_folder, exist_ok=True)
+
+    # If output folder exists, clean it first to ensure clean copy
+    if os.path.exists(output_folder):
+        delete_files_and_subfolders(output_folder)
+
+    # Copy source folder contents directly to output folder (excluding .git)
+    copy_folder_content(source_folder, output_folder, ignore_folders=[".git"])

plain2code.py

@@ -28,7 +28,7 @@
 
 MAX_UNITTEST_FIX_ATTEMPTS = 20
 MAX_CONFORMANCE_TEST_FIX_ATTEMPTS = 20
-MAX_CONFORMANCE_TEST_RUNS = 10
+MAX_CONFORMANCE_TEST_RUNS = 20
 MAX_REFACTORING_ITERATIONS = 5
 MAX_UNIT_TEST_RENDER_RETRIES = 2
 
@@ -138,6 +138,7 @@ def run_unittests(
         console.info(f"\n[b]Running unit tests script:[/b] {args.unittests_script}")
 
     unit_test_run_count = 0
+    fix_unittest_called = False
     while unit_test_run_count < MAX_UNITTEST_FIX_ATTEMPTS:
         unit_test_run_count += 1
 
@@ -185,6 +186,10 @@ def run_unittests(
                 style=console.INPUT_STYLE,
             )
 
+        if not fix_unittest_called:
+            run_state.increment_unittest_batch_id()
+        fix_unittest_called = True
+
         with console.status(f"[{console.INFO_STYLE}]Fixing unit tests issue for functional requirement {frid}...\n"):
             response_files = codeplainAPI.fix_unittests_issue(
                 frid, plain_source_tree, linked_resources, existing_files_content, unittests_issue, run_state
@@ -1049,11 +1054,10 @@ def render_functional_requirement(  # noqa: C901
         None,
         run_state.render_id,
     )
-
     return
 
 
-def render(args, run_state: RunState):
+def render(args, run_state: RunState):  # noqa: C901
     if args.verbose:
 
         logging.basicConfig(level=logging.DEBUG)
@@ -1141,6 +1145,22 @@ def render(args, run_state: RunState):
         )
         frid = plain_spec.get_next_frid(plain_source_tree, frid)
 
+    # Copy build and conformance tests folders to output folders if specified
+    if args.copy_build:
+        file_utils.copy_folder_to_output(args.build_folder, args.build_dest)
+        if args.verbose:
+            console.info(f"Copied build folder to {args.build_dest}")
+    if args.copy_conformance_tests:
+        file_utils.copy_folder_to_output(args.conformance_tests_folder, args.conformance_tests_dest)
+        if args.verbose:
+            console.info(f"Copied conformance tests folder to {args.conformance_tests_dest}")
+
+    console.info(f"\n[bold blue]Code rendering {run_state.render_id} was successfully finished![/bold blue]")
+    if args.copy_build:
+        console.info(f"The generated source code is available in {args.build_dest}")
+    if args.copy_conformance_tests:
+        console.info(f"Related conformance tests are placed in {args.conformance_tests_dest}")
+
     console.info(f"Render ID: {run_state.render_id}")
     return
 

plain2code_arguments.py

@@ -7,6 +7,8 @@
 CLAUDE_API_KEY = os.getenv("CLAUDE_API_KEY")
 DEFAULT_BUILD_FOLDER = "build"
 DEFAULT_CONFORMANCE_TESTS_FOLDER = "conformance_tests"
+DEFAULT_BUILD_DEST = "dist"
+DEFAULT_CONFORMANCE_TESTS_DEST = "dist_conformance_tests"
 
 UNIT_TESTS_SCRIPT_NAME = "unittests_script"
 CONFORMANCE_TESTS_SCRIPT_NAME = "conformance_tests_script"
@@ -90,7 +92,7 @@ def update_args_with_config(args, parser):
                 arg_action = action_types.get(key)
                 if arg_action and isinstance(arg_action, argparse._StoreAction):
                     # For regular arguments, only skip if explicitly provided
-                    if getattr(args, key) is not None:
+                    if getattr(args, key) is not None and (arg_action.default is None or value == arg_action.default):
                         continue
                 elif arg_action and isinstance(arg_action, argparse._StoreTrueAction):
                     # For boolean flags, skip if True (explicitly set)
@@ -178,12 +180,44 @@ def parse_arguments():
         "2) this custom template directory (if provided), "
         "3) built-in standard_template_library directory",
     )
+    parser.add_argument(
+        "--copy-build",
+        action="store_true",
+        default=False,
+        help="If set, copy the build folder to --build-dest after every successful functional requirement rendering.",
+    )
+    parser.add_argument(
+        "--build-dest",
+        type=non_empty_string,
+        default=DEFAULT_BUILD_DEST,
+        help="Target folder to copy build output to (used only if --copy-build is set).",
+    )
+    parser.add_argument(
+        "--copy-conformance-tests",
+        action="store_true",
+        default=False,
+        help="If set, copy the conformance tests folder to --conformance-tests-dest after every successful functional requirement rendering. Requires --conformance-tests-script.",
+    )
+    parser.add_argument(
+        "--conformance-tests-dest",
+        type=non_empty_string,
+        default=DEFAULT_CONFORMANCE_TESTS_DEST,
+        help="Target folder to copy conformance tests output to (used only if --copy-conformance-tests is set).",
+    )
 
     args = parser.parse_args()
     args = update_args_with_config(args, parser)
 
+    if args.build_folder == args.build_dest:
+        parser.error("--build-folder and --build-dest cannot be the same")
+    if args.conformance_tests_folder == args.conformance_tests_dest:
+        parser.error("--conformance-tests-folder and --conformance-tests-dest cannot be the same")
+
     args.render_conformance_tests = args.conformance_tests_script is not None
 
+    if not args.render_conformance_tests and args.copy_conformance_tests:
+        parser.error("--copy-conformance-tests requires --conformance-tests-script to be set")
+
     script_arg_names = [UNIT_TESTS_SCRIPT_NAME, CONFORMANCE_TESTS_SCRIPT_NAME]
     for script_name in script_arg_names:
         args = process_test_script_path(script_name, args)

plain2code_state.py

@@ -62,16 +62,20 @@ class RunState:
     """Contains information about the identifiable state of the rendering process."""
 
     def __init__(self, replay_with: Optional[str] = None):
-        self.replay = replay_with is not None
+        self.replay: bool = replay_with is not None
         if replay_with:
-            self.render_id = replay_with
+            self.render_id: str = replay_with
         else:
-            self.render_id = str(uuid.uuid4())
-        self.call_count = 0
+            self.render_id: str = str(uuid.uuid4())
+        self.call_count: int = 0
+        self.unittest_batch_id: int = 0
 
     def increment_call_count(self):
         self.call_count += 1
 
+    def increment_unittest_batch_id(self):
+        self.unittest_batch_id += 1
+
     def to_dict(self):
         return {
             "render_id": self.render_id,