bounded_subprocess 2.1.0__py3-none-any.whl → 2.3.0__py3-none-any.whl

bounded_subprocess/bounded_subprocess.py

@@ -7,6 +7,7 @@ from .util import (
     SLEEP_BETWEEN_READS,
     write_loop_sync,
     _STDIN_WRITE_TIMEOUT,
+    SLEEP_BETWEEN_WRITES,
 )
 
 
@@ -16,6 +17,7 @@ def run(
     max_output_size: int = 2048,
     env=None,
     stdin_data: Optional[str] = None,
+    stdin_write_timeout: Optional[int] = None,
 ) -> Result:
     """
     Runs the given program with arguments. After the timeout elapses, kills the process
@@ -24,12 +26,16 @@ def run(
     """
     state = BoundedSubprocessState(args, env, max_output_size, stdin_data is not None)
     if stdin_data is not None:
-        write_loop_sync(
+        ok = write_loop_sync(
             state.write_chunk,
             stdin_data.encode(),
-            _STDIN_WRITE_TIMEOUT,
-            sleep_interval=SLEEP_BETWEEN_READS,
+            stdin_write_timeout if stdin_write_timeout is not None else 15,
+            sleep_interval=SLEEP_BETWEEN_WRITES,
         )
+        if not ok:
+            state.terminate()
+            return Result(True, -1, "", "failed to write to stdin")
+
         state.close_stdin()
 
     # We sleep for 0.1 seconds in each iteration.

bounded_subprocess/bounded_subprocess_async.py

@@ -6,6 +6,7 @@ from .util import (
     SLEEP_BETWEEN_READS,
     write_loop_async,
     _STDIN_WRITE_TIMEOUT,
+    SLEEP_BETWEEN_WRITES,
 )
 
 
@@ -15,6 +16,7 @@ async def run(
     max_output_size: int = 2048,
     env=None,
     stdin_data: Optional[str] = None,
+    stdin_write_timeout: Optional[int] = None,
 ) -> Result:
     """
     Runs the given program with arguments. After the timeout elapses, kills the process
@@ -27,13 +29,16 @@ async def run(
     # async here? It's just the sleep between reads.
     state = BoundedSubprocessState(args, env, max_output_size, stdin_data is not None)
     if stdin_data is not None:
-        await write_loop_async(
+        ok = await write_loop_async(
             state.write_chunk,
             stdin_data.encode(),
-            _STDIN_WRITE_TIMEOUT,
-            sleep_interval=SLEEP_BETWEEN_READS,
+            stdin_write_timeout if stdin_write_timeout is not None else 15,
+            sleep_interval=SLEEP_BETWEEN_WRITES,
         )
-        state.close_stdin()
+        if not ok:
+            state.terminate()
+            return Result(True, -1, "", "failed to write to stdin")
+        await state.close_stdin_async(_STDIN_WRITE_TIMEOUT)
 
     # We sleep for 0.1 seconds in each iteration.
     max_iterations = timeout_seconds * 10

bounded_subprocess/util.py

@@ -9,7 +9,8 @@ import asyncio
 
 MAX_BYTES_PER_READ = 1024
 SLEEP_BETWEEN_READS = 0.1
-_STDIN_WRITE_TIMEOUT = 1.0
+_STDIN_WRITE_TIMEOUT = 15
+SLEEP_BETWEEN_WRITES = 0.01
 
 
 class Result:
@@ -147,6 +148,20 @@ class BoundedSubprocessState:
         except BrokenPipeError:
             pass
 
+    async def close_stdin_async(self, timeout: int) -> None:
+        if self.p.stdin is None:
+            return
+        for _ in range(timeout):
+            try:
+                self.p.stdin.close()
+                return
+            except BlockingIOError:
+                await asyncio.sleep(1)
+            except BrokenPipeError:
+                return
+
+
+
     def try_read(self) -> bool:
         """
         Reads from the process. Returning False indicates that we should stop

{bounded_subprocess-2.1.0.dist-info → bounded_subprocess-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bounded_subprocess
-Version: 2.1.0
+Version: 2.3.0
 Summary: A library to facilitate running subprocesses that may misbehave.
 Project-URL: Homepage, https://github.com/arjunguha/bounded_subprocess
 Project-URL: Bug Tracker, https://github.com/arjunguha/bounded_subprocess

bounded_subprocess-2.3.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+bounded_subprocess/__init__.py,sha256=L88cc8vG7GE11T0fF1-tMUIbRRlOmmlCqa6wopP3Ox8,1003
+bounded_subprocess/bounded_subprocess.py,sha256=BkGDiPKuyl3Mftn6kUkdUbIfeXuLCYWDo57T1uAa-hI,1470
+bounded_subprocess/bounded_subprocess_async.py,sha256=hN323BOureEZFpT26-FmfK4K2WXZnP2VAc8mDqxOEeQ,1813
+bounded_subprocess/interactive.py,sha256=4fG4NB3eN5rqssUpfjiEQL2F-S7eDBwB2Mw1gzCL3Qk,4149
+bounded_subprocess/interactive_async.py,sha256=WKPA2XBnq_qMh5WijyoSOpg2iJcsYcQSXNGjv6IEEfA,1979
+bounded_subprocess/util.py,sha256=kYrq1Bcuvczx4oSxzVfztMDDHbsMUr68FyN6Bh-zhaU,6789
+bounded_subprocess-2.3.0.dist-info/METADATA,sha256=Sk2zX0VawscdNUHuFtbXCOqrc8qx0WxxcCj_UAt4nD4,2664
+bounded_subprocess-2.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bounded_subprocess-2.3.0.dist-info/licenses/LICENSE.txt,sha256=UVerBV0_1vMFt8QkaXuVnZVSlOiKDiBSieK5MNLy4Ls,1086
+bounded_subprocess-2.3.0.dist-info/RECORD,,

bounded_subprocess-2.1.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-bounded_subprocess/__init__.py,sha256=L88cc8vG7GE11T0fF1-tMUIbRRlOmmlCqa6wopP3Ox8,1003
-bounded_subprocess/bounded_subprocess.py,sha256=-UuVhlbuMEWDNDjr_9tSUkcRxb-3RZKqOqup0nQI0zA,1231
-bounded_subprocess/bounded_subprocess_async.py,sha256=XSvi-FiKZbVbREnKDGiSG4UVViVoUBCCQzEohAS5GwM,1543
-bounded_subprocess/interactive.py,sha256=4fG4NB3eN5rqssUpfjiEQL2F-S7eDBwB2Mw1gzCL3Qk,4149
-bounded_subprocess/interactive_async.py,sha256=WKPA2XBnq_qMh5WijyoSOpg2iJcsYcQSXNGjv6IEEfA,1979
-bounded_subprocess/util.py,sha256=zaTl2LkhyOelRGotlgISkKy8cURQaTTNweTYoSchISA,6402
-bounded_subprocess-2.1.0.dist-info/METADATA,sha256=sxiscwiihS4QqFDVzXhgnwDfPdFBWunmX7N8KScypCw,2664
-bounded_subprocess-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bounded_subprocess-2.1.0.dist-info/licenses/LICENSE.txt,sha256=UVerBV0_1vMFt8QkaXuVnZVSlOiKDiBSieK5MNLy4Ls,1086
-bounded_subprocess-2.1.0.dist-info/RECORD,,