codeplain 0.3.11.dev9__tar.gz → 0.3.11.dev16__tar.gz

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/.flake8

@@ -20,6 +20,8 @@ exclude =
 per-file-ignores =
     __init__.py: F401
     tests/*: U100
+# require_git() runs between imports in plain_modules.py, so the imports below it trip E402
+    plain_modules.py: E402
 max-complexity = 15
 enable-extensions = U100
 # Plugin-specific configuration

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: codeplain
-Version: 0.3.11.dev9
+Version: 0.3.11.dev16
 Summary: Transform plain language specifications into working code
 License-File: LICENSE
 Classifier: Environment :: Console
@@ -16,7 +16,7 @@ Requires-Dist: python-liquid2==0.4.0
 Requires-Dist: pyyaml==6.0.3
 Requires-Dist: requests==2.34.2
 Requires-Dist: rich==15.0.0
-Requires-Dist: sentry-sdk==2.66.1
+Requires-Dist: sentry-sdk==2.68.1
 Requires-Dist: textual>=7.5.0
 Requires-Dist: tiktoken==0.14.0
 Requires-Dist: transitions==0.9.3

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/cli_output/status.py

@@ -6,6 +6,8 @@ from typing import Optional
 import codeplain_REST_api as codeplain_api
 from plain2code_console import console
 
+PLANS_URL = "https://platform.codeplain.ai/plans"
+
 
 def _create_progress_bar(remaining: int, total: int, width: int = 30) -> str:
     """Create a Unicode progress bar."""
@@ -42,12 +44,12 @@ def _display_credit_line(plan_credits: dict) -> None:
     bar = _create_progress_bar(remaining, total, width=30)
 
     # Format plan type label
-    plan_label = "Free trial" if plan_type == "free" else plan_type.upper() + " plan"
+    plan_label = "Free credits" if plan_type == "free" else plan_type.upper() + " plan"
 
     if is_expired:
-        console.print(f"    {plan_label:10} {bar}   expired {formatted_date}")
+        console.print(f"    {plan_label:12} {bar}   expired {formatted_date}")
     else:
-        console.print(f"    {plan_label:10} {bar}   {remaining:2} of {total} remaining    expires {formatted_date}")
+        console.print(f"    {plan_label:12} {bar}   {remaining:2} of {total} remaining    expires {formatted_date}")
 
 
 def _display_bucket_credit_line(bucket: dict, label: str) -> None:
@@ -71,9 +73,9 @@ def _display_bucket_credit_line(bucket: dict, label: str) -> None:
     bar = _create_progress_bar(remaining, total, width=30)
 
     if is_expired:
-        console.print(f"    {label:10} {bar}   expired {formatted_date}")
+        console.print(f"    {label:12} {bar}   expired {formatted_date}")
     else:
-        console.print(f"    {label:10} {bar}   {remaining:2} of {total} remaining    expires {formatted_date}")
+        console.print(f"    {label:12} {bar}   {remaining:2} of {total} remaining    expires {formatted_date}")
 
 
 def _display_status_message(plan_credits: Optional[dict], purchased_credits: list, promo_credits: list) -> None:
@@ -107,7 +109,11 @@ def _display_status_message(plan_credits: Optional[dict], purchased_credits: lis
             break
 
     if not has_remaining:
-        console.print("\nNo rendering credits remaining. Upgrade to continue rendering.")
+        console.print(
+            f"\nNo rendering credits remaining. Upgrade to the PRO plan at {PLANS_URL} to continue rendering."
+        )
+    else:
+        console.print(f"\nTo manage your plan navigate to {PLANS_URL}")
 
 
 def print_status(api_key: str, api_url: str, client_version: str) -> None:
@@ -148,7 +154,7 @@ def print_status(api_key: str, api_url: str, client_version: str) -> None:
     # Display rendering credits section
     console.print("Rendering credits:")
 
-    # Display plan credits (free trial or subscription)
+    # Display plan credits (free credits or subscription)
     if plan_credits:
         _display_credit_line(plan_credits)
 
@@ -162,4 +168,3 @@ def print_status(api_key: str, api_url: str, client_version: str) -> None:
 
     # Display status messages and management link
     _display_status_message(plan_credits, purchased_credits, promo_credits)
-    console.print("\nTo manage your plan navigate to https://platform.codeplain.ai/plans")

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/codeplain_REST_api.py

@@ -237,6 +237,7 @@ class CodeplainAPI:
         required_modules,
         unittests_issue,
         run_state: RunState,
+        conformance_tests_fixes: list[dict] | None = None,
     ):
         endpoint_url = f"{self.api_url}/fix_unittests_issue"
         headers = {"X-API-Key": self.api_key, "Content-Type": "application/json"}
@@ -251,6 +252,10 @@ class CodeplainAPI:
             "unittests_issue": unittests_issue,
             "unittest_batch_id": run_state.unittest_batch_id,
         }
+        # Implementation code changes made by the conformance tests fixer right before this unit tests run;
+        # only sent when unit tests are processed inside the conformance tests phase.
+        if conformance_tests_fixes is not None:
+            payload["conformance_tests_fixes"] = conformance_tests_fixes
 
         return self.post_request(endpoint_url, headers, payload, run_state)
 

codeplain-0.3.11.dev16/git_preflight.py

@@ -0,0 +1,41 @@
+"""Verify a working git is available before GitPython is imported.
+
+GitPython probes for the git executable on import and raises from module scope
+if it is missing or broken, so the CLI would crash with a traceback before
+main() could explain it.
+"""
+
+import shutil
+import subprocess
+import sys
+
+from plain2code_console import console
+
+GIT_MISSING_MESSAGE = "git is not installed. Please install git and try again."
+GIT_BROKEN_MESSAGE = "git is installed but not working. Please repair your git installation and try again."
+MACOS_BROKEN_GIT_HINT = (
+    "This usually means the Command Line Tools are missing; install them with 'xcode-select --install'."
+)
+
+
+def git_runs(git_path):
+    """Whether `git version` succeeds. A git on PATH can still be unusable: on
+    macOS without the Command Line Tools /usr/bin/git is a stub that exits with
+    an xcrun error, and GIT_PYTHON_REFRESH=quiet does not suppress that."""
+    try:
+        return subprocess.run([git_path, "version"], capture_output=True, timeout=10).returncode == 0
+    except (OSError, subprocess.SubprocessError):
+        return False
+
+
+def require_git():
+    """Exit with a clean message unless a working git is available."""
+    git_path = shutil.which("git")
+    if git_path is None:
+        console.error(f"{GIT_MISSING_MESSAGE}\n")
+        sys.exit(1)
+
+    if not git_runs(git_path):
+        hint = f"\n{MACOS_BROKEN_GIT_HINT}" if sys.platform == "darwin" else ""
+        console.error(f"{GIT_BROKEN_MESSAGE}{hint}\n")
+        sys.exit(1)

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/plain_file.py

@@ -615,15 +615,45 @@ def parse_plain_source(  # noqa: C901
                 f"Plain syntax error: Syntax error at line {nested_acceptance_test_heading.line_number}: {plain_spec.ACCEPTANCE_TEST_HEADING} heading should be nested under specific functional spec."
             )
 
+    defined_concepts = set[str]()
     if plain_source[plain_spec.DEFINITIONS] is not None:
         with PlainRenderer() as renderer:
             for token in plain_source[plain_spec.DEFINITIONS].children:
                 rendered_token = renderer.render(token)
                 new_concepts, _ = concept_utils.extract_concepts_from_definition(rendered_token)
+                defined_concepts.update(new_concepts)
                 for concept in new_concepts:
                     if concept in required_concepts:
                         required_concepts.remove(concept)
 
+    if EXPORTED_CONCEPTS_DIRECTIVE in plain_source_obj.metadata:
+        module_name = modules_trace[-1] if modules_trace else None
+        subject = f"Module '{module_name}'" if module_name else "Module"
+
+        for entry in plain_source_obj.metadata[EXPORTED_CONCEPTS_DIRECTIVE]:
+            exported_concepts, errors = concept_utils.extract_concepts_from_definition(entry)
+            if errors:
+                raise PlainSyntaxError(
+                    f"Plain syntax error: {subject} exports an invalid concept (`{entry}`). "
+                    f"Expected a concept token, e.g. :ConceptName:."
+                )
+
+            for exported_concept in exported_concepts:
+                if exported_concept in concept_utils.DEFAULT_CONCEPTS:
+                    raise PlainSyntaxError(
+                        f"Plain syntax error: {subject} cannot export default concept {exported_concept}. "
+                        f"Only user-defined concepts can be exported."
+                    )
+
+                if exported_concept not in defined_concepts:
+                    message = f"Plain syntax error: {subject} exports undefined concept {exported_concept}."
+                    if REQUIRES_DIRECTIVE in plain_source_obj.metadata:
+                        message += (
+                            " An exported concept must be defined in this module's definitions or in an "
+                            "imported module; a concept inherited through requires cannot be re-exported."
+                        )
+                    raise PlainSyntaxError(message)
+
     required_modules = []
     if REQUIRES_DIRECTIVE in plain_source_obj.metadata:
         required_modules = plain_source_obj.metadata[REQUIRES_DIRECTIVE]
@@ -710,15 +740,7 @@ def process_required_modules(
         if EXPORTED_CONCEPTS_DIRECTIVE in plain_file_parse_result.plain_source_obj.metadata:
             exported_concepts = list[str]()
             for concept in plain_file_parse_result.plain_source_obj.metadata[EXPORTED_CONCEPTS_DIRECTIVE]:
-                if concept in concept_utils.DEFAULT_CONCEPTS:
-                    raise PlainSyntaxError(
-                        f"Plain syntax error: Default concept cannot be exported: {concept}. Only user-defined concepts can be exported."
-                    )
-
-                if isinstance(concept, str):
-                    exported_concepts.extend(concept_utils.extract_concepts_from_definition(concept)[0])
-                else:
-                    raise PlainSyntaxError(f"Plain syntax error: Invalid exported concept: {concept}.")
+                exported_concepts.extend(concept_utils.extract_concepts_from_definition(concept)[0])
 
             with PlainRenderer() as renderer:
                 for exported_concept in exported_concepts:
@@ -737,6 +759,9 @@ def process_exported_definitions(plain_source: dict, exported_definitions: list[
     if len(exported_definitions) == 0:
         return
 
+    if plain_source[plain_spec.DEFINITIONS] is None:
+        plain_source[plain_spec.DEFINITIONS] = mistletoe.Document("")
+
     with PlainRenderer() as renderer:
         for exported_definition in exported_definitions:
             add_defintion = True

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/plain_modules.py

@@ -6,18 +6,18 @@ import tempfile
 import zipfile
 from functools import cached_property
 
+from git_preflight import require_git
 from plain2code_exceptions import (
-    GitNotInstalledError,
     InvalidModuleArchiveError,
     MissingPreviousFunctionalitiesError,
     ModuleDoesNotExistError,
 )
 
-try:
-    from git import Repo
-    from git.exc import NoSuchPathError
-except ImportError:
-    raise GitNotInstalledError("git is not installed. Please install git and try again.")
+# Must run before GitPython is imported, which raises on a missing or broken git.
+require_git()
+
+from git import Repo
+from git.exc import NoSuchPathError
 
 import file_utils
 import git_utils

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
     "rich==15.0.0",
     "python-frontmatter==1.3.0",
     "networkx==3.6.1",
-    "sentry-sdk==2.66.1",
+    "sentry-sdk==2.68.1",
 ]
 
 [project.optional-dependencies]

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/render_machine/actions/fix_conformance_test.py

@@ -189,6 +189,17 @@ class FixConformanceTest(BaseAction):
                 ctx.test_that_triggered_code_change = (ctx.current_testing_module_name, ctx.current_testing_frid)
                 ctx.execution_phase = TestExecutionPhase.RETRYING_AFTER_CODE_CHANGE
 
+                # Remember the change so that the unit tests fixer (which runs next) preserves it instead of
+                # reverting it - see FixUnitTests.
+                summary = fix_attempt_summary if isinstance(fix_attempt_summary, dict) else {}
+                ctx.implementation_code_fixes.append(
+                    {
+                        "hypothesis": summary.get("hypothesis"),
+                        "approach": summary.get("approach"),
+                        "code_diff": code_diff_files_content,
+                    }
+                )
+
                 journal.record_fix(
                     ctx.current_testing_module_name,
                     ctx.current_testing_frid,

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/render_machine/actions/fix_unit_tests.py

@@ -32,6 +32,13 @@ class FixUnitTests(BaseAction):
 
         render_utils.print_inputs(render_context, existing_files_content, "Files sent as input to unit tests fixing:")
 
+        conformance_tests_fixes = self._get_conformance_tests_fixes(render_context)
+        if conformance_tests_fixes:
+            console.info(
+                f"Unit tests are fixed while preserving {len(conformance_tests_fixes)} implementation code change(s) "
+                "made to fix the conformance tests."
+            )
+
         response_files = render_context.codeplain_api.fix_unittests_issue(
             render_context.frid_context.frid,
             render_context.plain_source_tree,
@@ -41,6 +48,7 @@ class FixUnitTests(BaseAction):
             render_context.get_required_modules_functionalities(),
             previous_unittests_issue,
             run_state=render_context.run_state,
+            conformance_tests_fixes=conformance_tests_fixes,
         )
 
         _, changed_files = file_utils.update_build_folder_with_rendered_files(
@@ -52,3 +60,20 @@ class FixUnitTests(BaseAction):
         console.print_files("Files fixed:", render_context.build_folder, response_files, style=console.OUTPUT_STYLE)
 
         return self.SUCCESSFUL_OUTCOME, None
+
+    @staticmethod
+    def _get_conformance_tests_fixes(render_context: RenderContext) -> list[dict] | None:
+        """Implementation code changes the conformance tests fixer made before these unit tests were run.
+
+        Only present when unit tests are processed inside the conformance tests phase - the implementation
+        and refactoring unit test passes have no conformance tests running context.
+        """
+        conformance_tests_running_context = getattr(render_context, "conformance_tests_running_context", None)
+        if conformance_tests_running_context is None:
+            return None
+
+        implementation_code_fixes = getattr(conformance_tests_running_context, "implementation_code_fixes", None)
+        if not implementation_code_fixes:
+            return None
+
+        return list(implementation_code_fixes)

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/render_machine/render_types.py

@@ -91,6 +91,11 @@ class ConformanceTestsRunningContext:
 
         self.current_testing_frid_high_level_implementation_plan: Optional[str] = None
 
+        # Implementation code changes made by the conformance tests fixer during this conformance phase, in
+        # order. Each entry is {"hypothesis": str | None, "approach": str | None, "code_diff": {file: diff}}.
+        # Handed to the unit tests fixer so it adjusts the unit tests instead of reverting these changes.
+        self.implementation_code_fixes: list[dict] = []
+
     def get_conformance_tests_json(self, module_name: str) -> dict:
         return self._conformance_tests_json[module_name]
 

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/requirements.txt

@@ -10,7 +10,7 @@ pytest==9.1.1
 textual>=7.5.0
 networkx==3.6.1
 transitions==0.9.3
-sentry-sdk==2.66.1
+sentry-sdk==2.68.1
 
 
 # Development dependencies

codeplain-0.3.11.dev16/tests/data/plainfileparser/cyclic_definitions.plain

@@ -0,0 +1,9 @@
+***definitions***
+- :A: relates to :B:.
+- :B: relates to :A:.
+
+***implementation reqs***
+- The :A: concept must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :A: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_defaults_exported.plain

@@ -0,0 +1,13 @@
+---
+exported_concepts:
+    - :UnitTests:
+---
+
+***definitions***
+- :NewConcept: is a new concept.
+
+***implementation reqs***
+- The :NewConcept: must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :NewConcept: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_imported_exported.plain

@@ -0,0 +1,12 @@
+---
+import:
+    - exported_concepts_base
+exported_concepts:
+    - :Concept:
+---
+
+***implementation reqs***
+- The :Concept: concept must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :Concept: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_inherited_reexported.plain

@@ -0,0 +1,15 @@
+---
+requires:
+    - exported_concepts
+exported_concepts:
+    - :Concept:
+---
+
+***definitions***
+- :DependantConcept: depends on the :Concept: concept.
+
+***implementation reqs***
+- The :DependantConcept: concept must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :DependantConcept: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_malformed.plain

@@ -0,0 +1,13 @@
+---
+exported_concepts:
+    - not a concept at all
+---
+
+***definitions***
+- :A: is a concept.
+
+***implementation reqs***
+- The :A: concept must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :A: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_missing_definition.plain

@@ -0,0 +1,14 @@
+---
+exported_concepts:
+    - :NewConcept:
+    - :Concept:
+---
+
+***definitions***
+- :NewConcept: is a new concept.
+
+***implementation reqs***
+- The :NewConcept: must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :NewConcept: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_missing_definition_example.plain

@@ -0,0 +1,13 @@
+---
+requires:
+    - exported_concepts_missing_definition
+---
+
+***definitions***
+- :AnotherConcept: is a new concept.
+
+***implementation reqs***
+- :AnotherConcept: must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :AnotherConcept: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_multiple_per_bullet.plain

@@ -0,0 +1,14 @@
+---
+exported_concepts:
+    - :NewConcept:, :OtherConcept:
+---
+
+***definitions***
+- :NewConcept: is a new concept.
+- :OtherConcept: is another concept.
+
+***implementation reqs***
+- The :NewConcept: and :OtherConcept: concepts must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :NewConcept: and :OtherConcept: concepts.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_multiple_per_bullet_undefined.plain

@@ -0,0 +1,13 @@
+---
+exported_concepts:
+    - :NewConcept:, :OtherConcept:
+---
+
+***definitions***
+- :NewConcept: is a new concept.
+
+***implementation reqs***
+- The :NewConcept: concept must be implemented.
+
+***functional specs***
+- Implement a wrapper for the :NewConcept: concept.

codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_no_definitions.plain

@@ -0,0 +1,10 @@
+---
+exported_concepts:
+    - :Concept:
+---
+
+***implementation reqs***
+- :Implementation: is a simple wrapper.
+
+***functional specs***
+- :Implementation: has an entry point.

codeplain-0.3.11.dev9/tests/data/plainfileparser/exported_concepts_missing_example.plain → codeplain-0.3.11.dev16/tests/data/plainfileparser/exported_concepts_not_declared_example.plain

@@ -1,6 +1,6 @@
 ---
 requires:
-    - exported_concepts_missing
+    - exported_concepts_not_declared
 ---
 
 ***definitions***

codeplain-0.3.11.dev16/tests/data/plainfileparser/requires_without_definitions_example.plain

@@ -0,0 +1,10 @@
+---
+requires:
+    - exported_concepts
+---
+
+***implementation reqs***
+- The :Concept: concept must be reused.
+
+***functional specs***
+- Implement a second wrapper for the :Concept: concept.

{codeplain-0.3.11.dev9 → codeplain-0.3.11.dev16}/tests/test_cli_output.py

@@ -67,7 +67,7 @@ class TestDisplayCreditLine:
 
     @patch("cli_output.status.console")
     def test_display_active_free_trial(self, mock_console):
-        """Test displaying active free trial credits."""
+        """Test displaying active free credits."""
         plan_credits = {
             "type": "free",
             "total": 50,
@@ -78,7 +78,7 @@ class TestDisplayCreditLine:
 
         mock_console.print.assert_called_once()
         call_args = mock_console.print.call_args[0][0]
-        assert "Free trial" in call_args
+        assert "Free credits" in call_args
         assert "4 of 50 remaining" in call_args
         assert "expires Dec 1, 2028" in call_args
 
@@ -259,6 +259,7 @@ class TestDisplayStatusMessage:
         mock_console.print.assert_called_once()
         call_args = mock_console.print.call_args[0][0]
         assert "No rendering credits remaining" in call_args
+        assert "https://platform.codeplain.ai/plans" in call_args
 
     @patch("cli_output.status.console")
     def test_expired_plan_credits(self, mock_console):