codeplain 0.2.7__tar.gz → 0.2.9__tar.gz

{codeplain-0.2.7 → codeplain-0.2.9}/.vscode/launch.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.2.0",
+    "version": "0.2.9",
     "configurations": [
         {
             "name": "Debug plain2code.py for file hello_world_python.plain",

{codeplain-0.2.7 → codeplain-0.2.9}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: codeplain
-Version: 0.2.7
+Version: 0.2.9
 Summary: Transform plain language specifications into working code
 License-File: LICENSE
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Code Generators
-Requires-Python: >=3.11
+Requires-Python: ==3.11
 Requires-Dist: gitpython==3.1.42
 Requires-Dist: mistletoe==1.3.0
 Requires-Dist: networkx==3.6.1
@@ -16,7 +16,7 @@ Requires-Dist: python-liquid2==0.3.0
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: requests==2.32.4
 Requires-Dist: rich==14.2.0
-Requires-Dist: textual==1.0.0
+Requires-Dist: textual>=7.5.0
 Requires-Dist: tiktoken==0.12.0
 Requires-Dist: transitions==0.9.3
 Provides-Extra: dev

{codeplain-0.2.7 → codeplain-0.2.9}/config/system_config.yaml

@@ -1,4 +1,4 @@
-client_version: "0.2.7"
+client_version: "0.17.0"
 
 error_messages:
   template_not_found:

{codeplain-0.2.7 → codeplain-0.2.9}/module_renderer.py

@@ -261,5 +261,10 @@ class ModuleRenderer:
         _, _, rendering_failed = self._render_module(self.filename, self.render_range, True)
         if not rendering_failed:
             # Get the last module that completed rendering
-            last_module_name = self.loaded_modules[-1].name if self.loaded_modules else ""
-            self.event_bus.publish(RenderCompleted(module_name=last_module_name, build_folder=self.args.build_folder))
+            if self.args.copy_build:
+                rendered_code_path = f"{self.args.build_dest}/"
+            else:
+                last_module_name = self.filename.replace(plain_file.PLAIN_SOURCE_FILE_EXTENSION, "")
+                rendered_code_path = f"{os.path.join(self.args.build_folder, last_module_name)}/"
+
+            self.event_bus.publish(RenderCompleted(rendered_code_path=rendered_code_path))

{codeplain-0.2.7 → codeplain-0.2.9}/plain2code_arguments.py

@@ -15,6 +15,7 @@ DEFAULT_CONFORMANCE_TESTS_DEST = "dist_conformance_tests"
 UNIT_TESTS_SCRIPT_NAME = "unittests_script"
 CONFORMANCE_TESTS_SCRIPT_NAME = "conformance_tests_script"
 DEFAULT_LOG_FILE_NAME = "codeplain.log"
+PREPARE_ENVIRONMENT_SCRIPT_NAME = "prepare_environment_script"
 
 
 def process_test_script_path(script_arg_name, config):
@@ -305,7 +306,7 @@ def parse_arguments():
     if args.full_plain and args.dry_run:
         parser.error("--full-plain and --dry-run are mutually exclusive")
 
-    script_arg_names = [UNIT_TESTS_SCRIPT_NAME, CONFORMANCE_TESTS_SCRIPT_NAME]
+    script_arg_names = [UNIT_TESTS_SCRIPT_NAME, CONFORMANCE_TESTS_SCRIPT_NAME, PREPARE_ENVIRONMENT_SCRIPT_NAME]
     for script_name in script_arg_names:
         args = process_test_script_path(script_name, args)
 

{codeplain-0.2.7 → codeplain-0.2.9}/plain2code_events.py

@@ -28,8 +28,7 @@ class RenderContextSnapshot:
 class RenderCompleted(BaseEvent):
     """Event emitted when rendering completes successfully."""
 
-    module_name: str
-    build_folder: str
+    rendered_code_path: str
 
 
 @dataclass

{codeplain-0.2.7 → codeplain-0.2.9}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "hatchling.build"
 
 [project]
 name = "codeplain"
-version = "0.2.7"
+version = "0.2.9"
 description = "Transform plain language specifications into working code"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = "==3.11"
 classifiers = [
     "Environment :: Console",
     "Intended Audience :: Developers",
@@ -22,10 +22,10 @@ dependencies = [
     "PyYAML==6.0.2",
     "gitpython==3.1.42",
     "transitions==0.9.3",
-    "textual==1.0.0",
+    "textual>=7.5.0",
     "rich==14.2.0",
     "python-frontmatter==1.1.0",
-    "networkx==3.6.1"
+    "networkx==3.6.1",
 ]
 
 [project.optional-dependencies]
@@ -46,7 +46,7 @@ include = [
     "config/**/*",
     "render_machine/**/*",
     "standard_template_library/**/*",
-    "tui/**/*"
+    "tui/**/*",
 ]
 
 [tool.black]
@@ -111,4 +111,4 @@ exclude = [
 [tool.pytest.ini_options]
 pythonpath = ["src"]
 testpaths = ["tests"]
-norecursedirs = ["tests/data"]
+norecursedirs = ["tests/data"]

{codeplain-0.2.7 → codeplain-0.2.9}/requirements.txt

@@ -7,7 +7,7 @@ tiktoken==0.12.0
 PyYAML==6.0.2
 gitpython==3.1.42
 pytest==8.3.4
-textual==1.0.0
+textual>=7.5.0
 networkx==3.6.1
 transitions==0.9.3
 
@@ -16,4 +16,4 @@ transitions==0.9.3
 flake8==7.0.0
 black==24.3.0
 isort==5.13.2
-mypy==1.11.2
+mypy==1.11.2

{codeplain-0.2.7 → codeplain-0.2.9}/tui/components.py

@@ -13,14 +13,23 @@ from .spinner import Spinner
 class CustomFooter(Horizontal):
     """A custom footer with keyboard shortcuts and render ID."""
 
+    FOOTER_TEXT = "ctrl+c: copy  *  ctrl+d: quit  *  ctrl+l: toggle logs"
+    RENDER_FINISHED_TEXT = "enter: exit  *  ctrl+c: copy  *  ctrl+l: toggle logs"
+
     def __init__(self, render_id: str = "", **kwargs):
         super().__init__(**kwargs)
         self.render_id = render_id
 
     def compose(self):
-        yield Static("ctrl+c: quit  *  ctrl+l: toggle logs", classes="custom-footer-text")
+        self._footer_text_widget = Static(self.FOOTER_TEXT, classes="custom-footer-text")
+        yield self._footer_text_widget
         if self.render_id:
-            yield Static(f"render id: {self.render_id}", classes="custom-footer-render-id")
+            yield Static(f"render id: {self.render_id} ", classes="custom-footer-render-id")
+
+    def show_render_finished(self) -> None:
+        """Update footer text to show render-finished keybindings."""
+        if self._footer_text_widget is not None:
+            self._footer_text_widget.update(self.RENDER_FINISHED_TEXT)
 
 
 class ScriptOutputType(str, Enum):
@@ -451,7 +460,9 @@ class LogEntry(Vertical):
             pass
 
     def on_click(self) -> None:
-        """Toggle details visibility on click."""
+        """Toggle details visibility on click, unless text is selected."""
+        if self.screen.get_selected_text():
+            return
         try:
             details = self.query_one(f"#log-details-{id(self)}")
             indicator = self.query_one(".log-expand-indicator", Static)

{codeplain-0.2.7 → codeplain-0.2.9}/tui/plain2code_tui.py

@@ -4,7 +4,9 @@ import time
 from typing import Callable, Optional
 
 from textual.app import App, ComposeResult
+from textual.binding import Binding
 from textual.containers import Vertical, VerticalScroll
+from textual.css.query import NoMatches
 from textual.widgets import ContentSwitcher, Static
 from textual.worker import Worker, WorkerFailed, WorkerState
 
@@ -53,7 +55,9 @@ class Plain2CodeTUI(App):
     """A Textual TUI for plain2code."""
 
     BINDINGS = [
-        ("ctrl+c", "quit", "Quit"),
+        Binding("ctrl+c", "copy_selection", "Copy", show=False),
+        Binding("ctrl+d", "quit", "Quit", show=False),
+        Binding("enter", "enter_exit", "Exit", show=False),
         ("ctrl+l", "toggle_logs", "Toggle Logs"),
     ]
 
@@ -77,6 +81,7 @@ class Plain2CodeTUI(App):
         self.conformance_tests_script: Optional[str] = conformance_tests_script
         self.prepare_environment_script: Optional[str] = prepare_environment_script
         self.state_machine_version = state_machine_version
+        self._render_finished = False
 
         # Initialize state handlers
         self._state_handlers: dict[str, StateHandler] = {
@@ -274,7 +279,13 @@ class Plain2CodeTUI(App):
 
     def on_render_completed(self, event: RenderCompleted):
         """Handle successful render completion."""
-        self._render_success_handler.handle(event.module_name, event.build_folder)
+        self._render_success_handler.handle(event.rendered_code_path)
+        self._render_finished = True
+        try:
+            footer = self.screen.query_one(CustomFooter)
+            footer.show_render_finished()
+        except NoMatches:
+            pass
 
     def on_render_failed(self, event: RenderFailed):
         """Handle render failure."""
@@ -298,12 +309,28 @@ class Plain2CodeTUI(App):
         # daemon=True ensures this thread dies with the process if it exits before the timer fires
         threading.Thread(target=ensure_exit, daemon=True).start()
 
+    async def action_copy_selection(self) -> None:
+        """Handle ctrl+c: copy selected text if any.
+
+        - If text is selected -> copy it to clipboard
+        - If no text is selected -> do nothing
+        """
+        selected_text = self.screen.get_selected_text()
+        if selected_text:
+            self.copy_to_clipboard(selected_text)
+            self.screen.clear_selection()
+            self.notify("Copied to clipboard", timeout=2)
+
+    def action_enter_exit(self) -> None:
+        """Handle enter: exit the TUI only after rendering has finished."""
+        if self._render_finished:
+            self.action_quit()
+
     def action_quit(self) -> None:
-        """An action to quit the application immediately when user presses 'q'.
+        """Quit the application immediately.
 
         Note: Force exit may leave files partially written if interrupted during file I/O operations.
         This is acceptable since the folders in which we are writing are git versioned and are reset in the next render.
         """
-        # Show stopping message to user
         self.render_worker.cancel()
         self.exit()

{codeplain-0.2.7 → codeplain-0.2.9}/tui/state_handlers.py

@@ -299,14 +299,13 @@ class RenderSuccessHandler:
         """
         self.tui = tui
 
-    def handle(self, module_name: str, build_folder: str) -> None:
+    def handle(self, rendered_code_path: str) -> None:
         """Handle successful render completion.
 
         Args:
-            module_name: Name of the last module that completed rendering
-            build_folder: The build folder path
+            rendered_code_path: The path to the rendered code
         """
-        display_success_message(self.tui, module_name, build_folder)
+        display_success_message(self.tui, rendered_code_path)
 
 
 class RenderErrorHandler: