Avoid timeouts on project_eval (ht christoph)

Author: josevalim

README.md

@@ -1,6 +1,6 @@
 # Tidewave
 
-> Tidewave Web for Django and Flask is currently in alpha testing!
+> Tidewave Web for Django, FastAPI, and Flask is currently in alpha testing!
 
 Tidewave is the coding agent for full-stack web app development, deeply integrated with Python web frameworks, from the database to the UI. [See our website](https://tidewave.ai) for more information.
 

src/tidewave/tools/project_eval.py

@@ -2,6 +2,7 @@
 import io
 import json as json_module
 import multiprocessing
+import queue as q
 from typing import Any, Optional
 
 
@@ -33,15 +34,15 @@ def project_eval(
     # us to terminate it once a timeout is reached. If we were to run
     # the code in another thread instead, we would have no clean way
     # of stopping it (other than signals, but those only work on Unix).
-
-    timeout = timeout / 1000  # Convert milliseconds to seconds.
+    timeout = timeout / 1000  # Convert milliseconds to seconds
 
     queue = multiprocessing.Queue()
     process = multiprocessing.Process(target=execute_code, args=(code, arguments, queue))
     process.start()
-    process.join(timeout)
 
-    if process.is_alive():
+    try:
+        output = queue.get(timeout=timeout)
+    except q.Empty:
         process.terminate()
         process.join()
         result = f"Code execution timed out after {timeout} seconds"
@@ -50,7 +51,7 @@ def project_eval(
         stderr = ""
         error_message = result
     else:
-        output = queue.get() if not queue.empty() else {}
+        process.join()
         result = output.get("result", "")
         success = output.get("success", False)
         stdout = output.get("stdout", "")
@@ -76,7 +77,7 @@ def project_eval(
             f"STDERR:\n{stderr}",
             f"Result:\n{str(result)}",
         ]
-        return "".join(output)
+        return "\n".join(output)
 
 
 # Note: Defined at the module level so it can be used in the multiprocessing context.

tests/test_project_eval.py

@@ -81,9 +81,16 @@ def test_non_json_output(self):
         """Test non-JSON output"""
         code = "print('hello world')\nresult = 42"
         result = project_eval(code, json=False)
-        expected_output = "STDOUT:\nhello world\nSTDERR:\nResult:\n42"
+        expected_output = "STDOUT:\nhello world\n\nSTDERR:\n\nResult:\n42"
         self.assertEqual(result, expected_output)
 
+    def test_large_output(self):
+        """Test large output"""
+        code = "'a' * 1_000_000"
+        result = project_eval(code, json=True)
+        output = self._collect_output(result)
+        self.assertEqual(len(output["result"]), 1_000_000)
+
     def test_multiline_code_execution(self):
         """Test multi-line Python code"""
         code = "a = 10\nb = 20\nresult = a + b"