weco 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

weco/utils.py

@@ -2,13 +2,13 @@ from typing import Any, Dict, List, Tuple, Union
 import json
 import time
 import subprocess
+import psutil
 from rich.layout import Layout
 from rich.live import Live
 from rich.panel import Panel
 import pathlib
 import requests
 from packaging.version import parse as parse_version
-
 from .constants import TRUNCATION_THRESHOLD, TRUNCATION_KEEP_LENGTH, DEFAULT_MODEL, SUPPORTED_FILE_EXTENSIONS
 
 
@@ -108,22 +108,52 @@ def truncate_output(output: str) -> str:
 
 def run_evaluation(eval_command: str, timeout: int | None = None) -> str:
     """Run the evaluation command on the code and return the output."""
+    process = subprocess.Popen(
+        eval_command, shell=True, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True
+    )
 
-    # Run the eval command as is
     try:
-        result = subprocess.run(eval_command, shell=True, capture_output=True, text=True, check=False, timeout=timeout)
-        # Combine stdout and stderr for complete output
-        output = result.stderr if result.stderr else ""
-        if result.stdout:
-            if len(output) > 0:
-                output += "\n"
-            output += result.stdout
-        return output  # Return full output, no truncation
+        # NOTE: Process tree cleanup only happens on timeout. Normal completion relies on the OS/shell to clean up child processes, which works for typical evaluation scripts.
+        output, _ = process.communicate(timeout=timeout)
+        return output
+
     except subprocess.TimeoutExpired:
+        # Kill process tree
+        try:
+            parent = psutil.Process(process.pid)
+            children = parent.children(recursive=True)
+
+            # Terminate gracefully
+            for child in children:
+                try:
+                    child.terminate()
+                except psutil.NoSuchProcess:
+                    pass
+            try:
+                parent.terminate()
+            except psutil.NoSuchProcess:
+                pass
+
+            # Wait, then force kill survivors
+            _, alive = psutil.wait_procs(children + [parent], timeout=1)
+            for proc in alive:
+                try:
+                    proc.kill()
+                except psutil.NoSuchProcess:
+                    pass
+
+        except psutil.NoSuchProcess:
+            pass
+
+        # Drain pipes
+        try:
+            process.communicate(timeout=1)
+        except (subprocess.TimeoutExpired, ValueError, OSError):
+            pass
+
         return f"Evaluation timed out after {'an unspecified duration' if timeout is None else f'{timeout} seconds'}."
 
 
-# Update Check Function
 def check_for_cli_updates():
     """Checks PyPI for a newer version of the weco package and notifies the user."""
     try:

{weco-0.3.1.dist-info → weco-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weco
-Version: 0.3.1
+Version: 0.3.2
 Summary: Documentation for `weco`, a CLI for using Weco AI's code optimizer.
 Author-email: Weco AI Team <contact@weco.ai>
 License: 
@@ -219,6 +219,7 @@ Requires-Dist: packaging
 Requires-Dist: gitingest
 Requires-Dist: fastapi
 Requires-Dist: slowapi
+Requires-Dist: psutil
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: build; extra == "dev"

{weco-0.3.1.dist-info → weco-0.3.2.dist-info}/RECORD

@@ -7,10 +7,10 @@ weco/constants.py,sha256=V6yFugTznKm5EC2_jr4I_whd7sqI80HiPggRn0az580,406
 weco/credits.py,sha256=C08x-TRcLg3ccfKqMGNRY7zBn7t3r7LZ119bxgfztaI,7629
 weco/optimizer.py,sha256=mJU8_0bo_6dS2PEj1E3dQHvNH9V4e8NSLNE55tmvspw,42291
 weco/panels.py,sha256=fnGPtmvxpx21AuBCtCFu1f_BpSxybNr2lhjIIKIutrY,16133
-weco/utils.py,sha256=TT57S0YGMuMWPFNsn0tcexNHZd-kBEjDeiOLWxANiQU,6117
-weco-0.3.1.dist-info/licenses/LICENSE,sha256=9LUfoGHjLPtak2zps2kL2tm65HAZIICx_FbLaRuS4KU,11337
-weco-0.3.1.dist-info/METADATA,sha256=e5xozCmFPB7ih2ntFNYQAMXAU_O8Kw3NDSiRhaNEu4c,31856
-weco-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-weco-0.3.1.dist-info/entry_points.txt,sha256=ixJ2uClALbCpBvnIR6BXMNck8SHAab8eVkM9pIUowcs,39
-weco-0.3.1.dist-info/top_level.txt,sha256=F0N7v6e2zBSlsorFv-arAq2yDxQbzX3KVO8GxYhPUeE,5
-weco-0.3.1.dist-info/RECORD,,
+weco/utils.py,sha256=erDDrA_g3KSlel6YEAGALlV_k8ftT-VQnPT1BrmzK8k,7021
+weco-0.3.2.dist-info/licenses/LICENSE,sha256=9LUfoGHjLPtak2zps2kL2tm65HAZIICx_FbLaRuS4KU,11337
+weco-0.3.2.dist-info/METADATA,sha256=TDJIvT1vw3VFrjEj9o8VkLuxis2MWWAL0pnDYqpFfak,31878
+weco-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+weco-0.3.2.dist-info/entry_points.txt,sha256=ixJ2uClALbCpBvnIR6BXMNck8SHAab8eVkM9pIUowcs,39
+weco-0.3.2.dist-info/top_level.txt,sha256=F0N7v6e2zBSlsorFv-arAq2yDxQbzX3KVO8GxYhPUeE,5
+weco-0.3.2.dist-info/RECORD,,