Cleanup

Author: zanjonke

git_utils.py

@@ -64,7 +64,7 @@ def init_git_repo(
     path_to_repo: Union[str, os.PathLike],
     module_name: Optional[str] = None,
     render_id: Optional[str] = None,
-    additional_files: Optional[dict[str, str]] = None,
+    initial_files: Optional[dict[str, str]] = None,
 ) -> Repo:
     """
     Initializes a new git repository in the given path.
@@ -79,8 +79,8 @@ def init_git_repo(
     repo = Repo.init(path_to_repo)
     _ensure_git_config(repo)
 
-    if additional_files:
-        file_utils.store_response_files(path_to_repo, additional_files, [])
+    if initial_files:
+        file_utils.store_response_files(path_to_repo, initial_files, [])
         repo.git.add(".")
 
     repo.git.commit(
@@ -95,12 +95,12 @@ def clone_repo(
     new_repo_path: str,
     module_name: Optional[str] = None,
     render_id: Optional[str] = None,
-    additional_files: Optional[dict[str, str]] = None,
+    initial_files: Optional[dict[str, str]] = None,
 ) -> Repo:
     repo = Repo.clone_from(source_repo_path, new_repo_path)
 
-    if additional_files:
-        file_utils.store_response_files(new_repo_path, additional_files, [])
+    if initial_files:
+        file_utils.store_response_files(new_repo_path, initial_files, [])
         repo.git.add(".")
 
     repo.git.commit(

partial_rendering.py

@@ -80,7 +80,7 @@ def module_comes_before(
         if module.module_name == module2.module_name:
             return False
 
-    raise Exception(f"Module {module1.module_name} and {module2.module_name} not found in {all_required_modules}")
+    raise ValueError(f"Module {module1.module_name} and {module2.module_name} not found in {all_required_modules}")
 
 
 def detect_partial_rendering(plain_module: PlainModule) -> PartialRender | None:

plain_modules.py

@@ -2,6 +2,7 @@
 
 import json
 import os
+from functools import cached_property
 
 from git.exc import NoSuchPathError
 
@@ -45,7 +46,7 @@ def __init__(self, filename: str, build_folder: str, conformance_tests_folder: s
                 for module_name in required_modules_names
             ]
 
-    @property
+    @cached_property
     def all_required_modules(self) -> list[PlainModule]:
         all_required_modules = []
         for required_module in self.required_modules:
@@ -67,7 +68,7 @@ def module_build_folder(self):
     def get_codeplain_folder(self):
         return os.path.join(self.module_build_folder, CODEPLAIN_METADATA_FOLDER)
 
-    def get_last_rendered_frid(self) -> tuple[str, str | None]:
+    def get_last_rendered_frid(self) -> tuple[str | None, str | None]:
         if len(self.required_modules) == 0:
             return git_utils.get_last_finished_frid(self.module_build_folder)
 
@@ -174,7 +175,7 @@ def save_module_metadata(self, only_hashes: bool = False):
                 json.dump(module_metadata, f, indent=4)
             return
 
-        module_metadata[MODULE_FUNCTIONALITIES] = (self._get_module_functional_requirements(),)
+        module_metadata[MODULE_FUNCTIONALITIES] = self._get_module_functional_requirements()
 
         required_modules_functionalities = {}
         for required_module in self.required_modules:
@@ -186,7 +187,7 @@ def save_module_metadata(self, only_hashes: bool = False):
         with open(metadata_path, "w", encoding="utf-8") as f:
             json.dump(module_metadata, f, indent=4)
 
-    def _ensure_module_folders_exist(self, first_render_frid: str, render_conformance_tests: bool) -> tuple[str, str]:
+    def _ensure_module_folders_exist(self, first_render_frid: str, render_conformance_tests: bool):
         """
         Ensure that build and conformance test folders exist for the module.
 
@@ -286,12 +287,16 @@ def get_module_by_name(self, module_name: str) -> PlainModule:
 
         raise ModuleDoesNotExistError(f"Module {module_name} does not exist")
 
-    def get_next_module(self, module_name: str) -> PlainModule | None:
-        for idx, module in enumerate(self.all_required_modules):
-            if module.module_name == module_name and idx < len(self.all_required_modules) - 1:
-                return self.all_required_modules[idx + 1]
+    def get_next_module(self, module_name: str) -> PlainModule:
+        all_modules = self.all_required_modules + [self]
+        for idx, module in enumerate(all_modules):
+            if module.module_name == module_name and idx < len(all_modules) - 1:
+                return all_modules[idx + 1]
+
+        if module_name == self.module_name:
+            return self
 
-        return self
+        raise ModuleDoesNotExistError(f"Module {module_name} does not exist")
 
     def get_next_frid(self, frid: str, module_name: str) -> tuple[str, PlainModule]:
         module = self.get_module_by_name(module_name)

render_machine/actions/prepare_repositories.py

@@ -35,7 +35,7 @@ def execute(self, render_context: RenderContext, _previous_action_payload: Any |
 
         else:
             module_hashes = render_context.plain_module.get_hashes()
-            additional_files = {
+            initial_files = {
                 render_context.plain_module.module_metadata_path(for_git_repo=True): json.dumps(module_hashes)
             }
 
@@ -50,7 +50,7 @@ def execute(self, render_context: RenderContext, _previous_action_payload: Any |
                     render_context.build_folder,
                     render_context.module_name,
                     render_context.run_state.render_id,
-                    additional_files,
+                    initial_files,
                 )
             else:
                 if render_context.verbose:
@@ -60,7 +60,7 @@ def execute(self, render_context: RenderContext, _previous_action_payload: Any |
                     render_context.build_folder,
                     render_context.module_name,
                     render_context.run_state.render_id,
-                    additional_files,
+                    initial_files,
                 )
 
                 if render_context.base_folder:
@@ -78,7 +78,7 @@ def execute(self, render_context: RenderContext, _previous_action_payload: Any |
                     render_context.conformance_tests.get_module_conformance_tests_folder(render_context.module_name),
                     render_context.module_name,
                     render_context.run_state.render_id,
-                    additional_files,
+                    initial_files,
                 )
 
         return self.SUCCESSFUL_OUTCOME, None

render_machine/render_context.py

@@ -128,7 +128,6 @@ def create_snapshot(self) -> RenderContextSnapshot:
         )
 
     def get_required_modules_functionalities(self):
-        print(f"Getting required modules functionalities for {self.module_name}...")
         required_modules_functionalities = {}
         if self.required_modules is not None and len(self.required_modules) > 0:
             for required_module in self.required_modules:

tests/test_plain_modules.py

@@ -183,20 +183,17 @@ def test_get_next_module_returns_next_in_sequence(root_module):
     assert nxt.module_name == "pr_middle"
 
 
-def test_get_next_module_returns_self_when_at_last(root_module):
+def test_get_next_module_returns_self_when_at_last_required_module(root_module):
     """When the given module is the last required module, ``get_next_module``
-    falls back to the top-level module itself — callers then progress to the
-    root's first FRID."""
+    returns the top-level module — callers then progress to the root's first FRID."""
     nxt = root_module.get_next_module("pr_middle")
     assert nxt is root_module
 
 
-def test_get_next_module_returns_self_when_module_not_found(root_module):
-    """Unknown module names no longer raise — they return the top-level
-    module. This is a pre-existing behaviour that callers rely on when the
-    tree has been fully traversed."""
-    nxt = root_module.get_next_module("unknown")
-    assert nxt is root_module
+def test_get_next_module_raises_when_module_not_found(root_module):
+    """Unknown module names raise ``ModuleDoesNotExistError``."""
+    with pytest.raises(ModuleDoesNotExistError, match="unknown"):
+        root_module.get_next_module("unknown")
 
 
 # --------------------------------------------------------------------------

tui/partial_render_tui.py

@@ -13,7 +13,7 @@
 class PartialRenderTUI(App):
     BINDINGS = [
         Binding("ctrl+o", "toggle_expand", "Expand/Collapse", show=False),
-        Binding("ctrl+c", "quit", "Quit", show=False),
+        Binding("ctrl+c", "copy_selection", "Copy", show=False),
         Binding("ctrl+d", "quit", "Quit", show=False),
     ]
 
@@ -61,9 +61,8 @@ def on_mount(self) -> None:
             info_box.mount(Label("Module fully rendered", classes="rendering-info-row"))
         else:
             frid = pr.last_render_frid
-            functionality = pr.last_render_module.plain_source[plain_spec.FUNCTIONAL_REQUIREMENTS][int(frid) - 1][
-                "markdown"
-            ]
+            specifications, _ = plain_spec.get_specifications_for_frid(pr.last_render_module.plain_source, frid)
+            functionality = specifications[plain_spec.FUNCTIONAL_REQUIREMENTS][-1]
             label = Label("", classes="rendering-info-row")
             info_box.mount(label)
             self._register_expandable(label, f"Functionality {frid}:", functionality)
@@ -167,6 +166,21 @@ def action_toggle_expand(self) -> None:
 
     @on(ListView.Selected)
     def on_choice_selected(self, event: ListView.Selected) -> None:
-        key = event.item.id.split("-", 1)[1]
+        item_id = event.item.id
+        if not item_id or not item_id.startswith("choice-"):
+            raise ValueError(f"Invalid item ID: {item_id}")
+        key = item_id.split("-", 1)[1]
         self.selected_choice = self.choices[key]
         self.exit(self.selected_choice)
+
+    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)

tui/styles.css

@@ -460,4 +460,4 @@ ListItem.-highlight {
 #choice-list {
     margin: 0 1;
     height: auto;
-}
+}