Update commit messages, minor improvements and bug fixes

Author: tjazerzen

git_utils.py

@@ -5,13 +5,20 @@
 
 import file_utils
 
-INITIAL_COMMIT_MESSAGE = "[Codeplain] Initial commit"
-BASE_FOLDER_COMMIT_MESSAGE = "[Codeplain] Initialize build with Base Folder content"
-REFACTORED_CODE_COMMIT_MESSAGE = "[Codeplain] Refactored code after implementing {}"
+FUNCTIONAL_REQUIREMENT_IMPLEMENTED_COMMIT_MESSAGE = (
+    "[Codeplain] Implemented code and unit tests for functional requirement {}"
+)
+REFACTORED_CODE_COMMIT_MESSAGE = "[Codeplain] Refactored code after implementing functional requirement {}"
 CONFORMANCE_TESTS_PASSED_COMMIT_MESSAGE = (
     "[Codeplain] Fixed issues in the implementation code identified during conformance testing"
 )
+
+# Following messages are used as checkpoints in the git history
+# Changing them will break backwards compatibility so change them with care
 FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE = "[Codeplain] Functional requirement ID (FRID):{} fully implemented"
+INITIAL_COMMIT_MESSAGE = "[Codeplain] Initial commit"
+BASE_FOLDER_COMMIT_MESSAGE = "[Codeplain] Initialize build with Base Folder content"
+
 
 RENDERED_FRID_MESSAGE = "Changes related to Functional requirement ID (FRID): {}"
 RENDER_ID_MESSAGE = "Render ID: {}"

plain2code.py

@@ -18,6 +18,7 @@
 from plain2code_arguments import parse_arguments
 from plain2code_console import console
 from plain2code_state import CONFORMANCE_TESTS_DEFINITION_FILE_NAME, ConformanceTestsUtils, ExecutionState, RunState
+from plain2code_utils import RetryOnlyFilter
 from system_config import system_config
 
 TEST_SCRIPT_EXECUTION_TIMEOUT = 120  # 120 seconds
@@ -884,7 +885,10 @@ def render_functional_requirement(  # noqa: C901
                     changed_files.add(file_name)
 
             git_utils.add_all_files_and_commit(
-                args.build_folder, functional_requirement_text, frid, run_state.render_id
+                args.build_folder,
+                f"{git_utils.FUNCTIONAL_REQUIREMENT_IMPLEMENTED_COMMIT_MESSAGE.format(frid)}\n\n{functional_requirement_text}",
+                frid,
+                run_state.render_id,
             )
             break
 
@@ -907,12 +911,20 @@ def render_functional_requirement(  # noqa: C901
     # Phase 3: Refactor the source code if needed.
     console.info("[b]Refactoring the generated code...[/b]")
     num_refactoring_iterations = 0
-    while num_refactoring_iterations < MAX_REFACTORING_ITERATIONS:
+    while True:
         num_refactoring_iterations += 1
+
+        existing_files = file_utils.list_all_text_files(args.build_folder)
+
+        if num_refactoring_iterations > MAX_REFACTORING_ITERATIONS:
+            console.info(
+                f"Refactoring iterations limit of {MAX_REFACTORING_ITERATIONS} reached for functional requirement {frid}."
+            )
+            break
+
         if args.verbose:
             console.info(f"\nRefactoring iteration {num_refactoring_iterations}.")
 
-        existing_files = file_utils.list_all_text_files(args.build_folder)
         existing_files_content = file_utils.get_existing_files_content(args.build_folder, existing_files)
         if args.verbose:
             console.print_files(
@@ -1043,23 +1055,29 @@ def render_functional_requirement(  # noqa: C901
 
 def render(args, run_state: RunState):
     if args.verbose:
+
+        logging.basicConfig(level=logging.DEBUG)
+        logging.getLogger("urllib3").setLevel(logging.WARNING)
+        logging.getLogger("httpx").setLevel(logging.WARNING)
+        logging.getLogger("httpcore").setLevel(logging.WARNING)
+        logging.getLogger("anthropic").setLevel(logging.WARNING)
+        logging.getLogger("langsmith").setLevel(logging.WARNING)
+        logging.getLogger("git").setLevel(logging.WARNING)
+        logging.getLogger("anthropic._base_client").setLevel(logging.DEBUG)
+
         # Try to load logging configuration from YAML file
         if os.path.exists(LOGGING_CONFIG_PATH):
             try:
                 with open(LOGGING_CONFIG_PATH, "r") as f:
                     config = yaml.safe_load(f)
                     logging.config.dictConfig(config)
                     console.info(f"Loaded logging configuration from {LOGGING_CONFIG_PATH}")
-            except Exception:
-                pass
+            except Exception as e:
+                console.warning(f"Failed to load logging configuration from {LOGGING_CONFIG_PATH}: {str(e)}")
 
-        logging.basicConfig(level=logging.DEBUG)
-
-        logging.getLogger("urllib3").setLevel(logging.WARNING)
-        logging.getLogger("httpx").setLevel(logging.WARNING)
-        logging.getLogger("httpcore").setLevel(logging.WARNING)
-        logging.getLogger("anthropic").setLevel(logging.WARNING)
-        logging.getLogger("langsmith").setLevel(logging.WARNING)
+        # if we have debug level for anthropic._base_client to debug, catch only logs relevant to retrying (ones that are relevant for us)
+        if logging.getLogger("anthropic._base_client").level == logging.DEBUG:
+            logging.getLogger("anthropic._base_client").addFilter(RetryOnlyFilter())
 
         formatter = IndentedFormatter("%(levelname)s:%(name)s:%(message)s")
         console_handler = logging.StreamHandler()

plain2code_utils.py

@@ -0,0 +1,20 @@
+import logging
+
+
+class RetryOnlyFilter(logging.Filter):
+    def filter(self, record):
+        # Allow all logs with level > DEBUG (i.e., INFO and above)
+        if record.levelno > logging.DEBUG:
+            return True
+        # For DEBUG logs, only allow if message matches retry-related patterns
+        msg = record.getMessage().lower()
+        return (
+            "retrying due to" in msg
+            or "raising timeout error" in msg
+            or "raising connection error" in msg
+            or "encountered exception" in msg
+            or "retrying request" in msg
+            or "retry left" in msg
+            or "1 retry left" in msg
+            or "retries left" in msg
+        )