codeplain 0.2.16__tar.gz → 0.2.18__tar.gz

{codeplain-0.2.16 → codeplain-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeplain
-Version: 0.2.16
+Version: 0.2.18
 Summary: Transform plain language specifications into working code
 License-File: LICENSE
 Classifier: Environment :: Console

codeplain-0.2.18/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.18"

{codeplain-0.2.16 → codeplain-0.2.18}/examples/example_hello_world_python/hello_world_python.plain

@@ -2,8 +2,6 @@
 description: '"hello, world" in Plain (Python version)'
 import:
   - python-console-app-template
-requires:
-  - python-console-app-boilerplate
 ---
 
 ***implementation reqs***

{codeplain-0.2.16 → codeplain-0.2.18}/render_machine/render_utils.py

@@ -19,7 +19,7 @@ SCRIPT_EXECUTION_TIMEOUT = 120
 TIMEOUT_ERROR_EXIT_CODE = 124
 POLL_INTERVAL_SECONDS = 0.2
 SIGTERM_GRACE_PERIOD_SECONDS = 0.2
-STDOUT_READ_TIMEOUT_SECONDS = 5
+STDOUT_READ_TIMEOUT_SECONDS = 2
 F_SETPIPE_SIZE = 1031  # Linux-only constant
 PIPE_SIZE_KB = 1024  # 1MB
 
@@ -120,11 +120,27 @@ def execute_script(  # noqa: C901
         # Set the pipe size to 1MB to avoid buffer overflows
         fcntl.fcntl(proc.stdout.fileno(), F_SETPIPE_SIZE, PIPE_SIZE_KB * 1024)  # 1MB
 
+    # Drain stdout in a background thread to prevent pipe buffer deadlock.
+    # macOS has a 64KB pipe buffer; without continuous draining, scripts that produce
+    # more output than that block on write and never exit, causing spurious timeouts.
+    output_chunks: list[str] = []
+
+    def _drain_stdout() -> None:
+        try:
+            for chunk in iter(lambda: proc.stdout.read(8192), ""):
+                output_chunks.append(chunk)
+        except (OSError, ValueError):
+            pass
+
+    reader = threading.Thread(target=_drain_stdout, daemon=True)
+    reader.start()
+
     try:
         while proc.poll() is None:
             if time.time() - start_time >= script_timeout:
                 _kill_process(proc)
-                partial_stdout = proc.stdout.read()
+                reader.join(timeout=2)
+                partial_stdout = "".join(output_chunks)
                 exc = subprocess.TimeoutExpired(cmd, script_timeout)
                 exc.stdout = partial_stdout
                 raise exc
@@ -136,12 +152,13 @@ def execute_script(  # noqa: C901
             else:
                 time.sleep(POLL_INTERVAL_SECONDS)
 
-        # Use communicate() with a timeout because child processes may hold the pipe open after the main process exits.
-        try:
-            stdout, _ = proc.communicate(timeout=STDOUT_READ_TIMEOUT_SECONDS)
-        except subprocess.TimeoutExpired:
+        # Wait for the reader to finish draining remaining output.
+        # Close stdout if child processes keep the pipe open beyond the grace period.
+        reader.join(timeout=STDOUT_READ_TIMEOUT_SECONDS)
+        if reader.is_alive():
             proc.stdout.close()
-            stdout = ""
+            reader.join(timeout=1)
+        stdout = "".join(output_chunks)
         elapsed_time = time.time() - start_time
 
         sanitized_script_output = _sanitize_script_output(stdout)
@@ -201,8 +218,14 @@ def execute_script(  # noqa: C901
                 f"The {script_type} script timed out after {script_timeout} seconds. {script_type} script output stored in: {temp_file_path}"
             )
 
+        partial_output = ""
+        if e.stdout:
+            decoded = e.stdout.decode("utf-8") if isinstance(e.stdout, bytes) else e.stdout
+            sanitized = _sanitize_script_output(decoded)
+            if sanitized:
+                partial_output = f"\nPartial test script output:\n{sanitized}"
         return (
             TIMEOUT_ERROR_EXIT_CODE,
-            f"{script_type} script did not finish in {script_timeout} seconds.",
+            f"{script_type} script did not finish in {script_timeout} seconds.{partial_output}",
             temp_file_path,
         )

codeplain-0.2.16/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.16"

codeplain-0.2.16/examples/example_hello_world_python/python-console-app-boilerplate.plain

@@ -1,13 +0,0 @@
----
-import:
-  - python-console-app-template
----
-
-***implementation reqs***
-
-- :Implementation: should be in Python.
-
-***functional specs***
-
-- Implement the entrypoint of :App:.
-