omlish 0.0.0.dev308__tar.gz → 0.0.0.dev309__tar.gz

{omlish-0.0.0.dev308/omlish.egg-info → omlish-0.0.0.dev309}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev308
+Version: 0.0.0.dev309
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev308'
-__revision__ = '78cf17d1a6de1ee32440b0b62de28fdd17f9bedc'
+__version__ = '0.0.0.dev309'
+__revision__ = '1304f03bec6edcdf467784eeceb7c0e00a7ec49c'
 
 
 #

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/asyncs/asyncio/sockets.py

@@ -14,7 +14,7 @@ async def asyncio_wait_until_can_connect(
         host: ta.Any = None,
         port: ta.Any = None,
         *,
-        timeout: ta.Optional[TimeoutLike] = None,
+        timeout: TimeoutLike = None,
         on_fail: ta.Optional[ta.Callable[[BaseException], None]] = None,
         sleep_s: float = .1,
         exception: ta.Union[ta.Type[BaseException], ta.Tuple[ta.Type[BaseException], ...]] = (Exception,),

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/asyncs/asyncio/subprocesses.py

@@ -131,7 +131,7 @@ class AsyncioProcessCommunicator:
     async def communicate(
             self,
             input: ta.Any = None,  # noqa
-            timeout: ta.Optional[TimeoutLike] = None,
+            timeout: TimeoutLike = None,
     ) -> Communication:
         return await asyncio_maybe_timeout(self._communicate(input), timeout)
 
@@ -144,7 +144,7 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
             self,
             proc: asyncio.subprocess.Process,
             input: ta.Any = None,  # noqa
-            timeout: ta.Optional[TimeoutLike] = None,
+            timeout: TimeoutLike = None,
     ) -> ta.Tuple[ta.Optional[bytes], ta.Optional[bytes]]:
         return await AsyncioProcessCommunicator(proc).communicate(input, timeout)  # noqa
 
@@ -155,7 +155,7 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
             self,
             *cmd: str,
             shell: bool = False,
-            timeout: ta.Optional[TimeoutLike] = None,
+            timeout: TimeoutLike = None,
             **kwargs: ta.Any,
     ) -> ta.AsyncGenerator[asyncio.subprocess.Process, None]:
         with self.prepare_and_wrap( *cmd, shell=shell, **kwargs) as (cmd, kwargs):  # noqa

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/asyncs/asyncio/timeouts.py

@@ -15,7 +15,7 @@ AwaitableT = ta.TypeVar('AwaitableT', bound=ta.Awaitable)
 
 def asyncio_maybe_timeout(
         fut: AwaitableT,
-        timeout: ta.Optional[TimeoutLike] = None,
+        timeout: TimeoutLike = None,
 ) -> AwaitableT:
     if timeout is not None:
         fut = asyncio.wait_for(fut, Timeout.of(timeout)())  # type: ignore

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/daemons/daemon.py

@@ -109,7 +109,7 @@ class Daemon:
 
     def wait_sync(
             self,
-            timeout: lang.TimeoutLike = lang.Timeout.Default,
+            timeout: lang.TimeoutLike = lang.Timeout.DEFAULT,
             *,
             max_tries: int | None = None,
     ) -> None:
@@ -140,7 +140,7 @@ class Daemon:
 
         return launcher.launch()
 
-    def launch(self, timeout: lang.TimeoutLike = lang.Timeout.Default) -> None:
+    def launch(self, timeout: lang.TimeoutLike = lang.Timeout.DEFAULT) -> None:
         self.launch_no_wait()
 
         self.wait_sync(timeout)

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/lite/timeouts.py

@@ -8,7 +8,7 @@ import time
 import typing as ta
 
 
-TimeoutLike = ta.Union['Timeout', ta.Type['Timeout.Default'], ta.Iterable['TimeoutLike'], float]  # ta.TypeAlias
+TimeoutLike = ta.Union['Timeout', ta.Type['Timeout.DEFAULT'], ta.Iterable['TimeoutLike'], float, None]  # ta.TypeAlias
 
 
 ##
@@ -54,7 +54,7 @@ class Timeout(abc.ABC):
 
     #
 
-    class Default:
+    class DEFAULT:  # Noqa
         def __new__(cls, *args, **kwargs):  # noqa
             raise TypeError
 
@@ -65,7 +65,7 @@ class Timeout(abc.ABC):
     @classmethod
     def of(
             cls,
-            obj: ta.Optional[TimeoutLike],
+            obj: TimeoutLike,
             default: ta.Union[TimeoutLike, ta.Type[_NOT_SPECIFIED]] = _NOT_SPECIFIED,
     ) -> 'Timeout':
         if obj is None:
@@ -80,8 +80,8 @@ class Timeout(abc.ABC):
         elif isinstance(obj, ta.Iterable):
             return CompositeTimeout(*[Timeout.of(c) for c in obj])
 
-        elif obj is Timeout.Default:
-            if default is Timeout._NOT_SPECIFIED or default is Timeout.Default:
+        elif obj is Timeout.DEFAULT:
+            if default is Timeout._NOT_SPECIFIED or default is Timeout.DEFAULT:
                 raise RuntimeError('Must specify a default timeout')
 
             else:

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/os/pidfiles/pinning.py

@@ -64,7 +64,7 @@ class PidfilePinner(abc.ABC):
             self,
             path: str,
             *,
-            timeout: ta.Optional[TimeoutLike] = None,
+            timeout: TimeoutLike = None,
             inheritable: bool = False,  # Present to match Pidfile kwargs for convenience, but enforced to be False.
             **kwargs: ta.Any,
     ) -> ta.Iterator[int]:

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/sockets/ports.py

@@ -38,7 +38,7 @@ def get_available_ports(
         *,
         host: ta.Optional[str] = None,
         exclude: ta.Optional[ta.Iterable[int]] = None,
-        timeout: ta.Optional[TimeoutLike] = None,
+        timeout: TimeoutLike = None,
 ) -> ta.List[int]:
     exclude = set(exclude or [])
 

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/sockets/wait.py

@@ -14,7 +14,7 @@ from ..lite.timeouts import TimeoutLike
 def socket_can_connect(
         address: ta.Any,
         *,
-        timeout: ta.Optional[TimeoutLike] = None,
+        timeout: TimeoutLike = None,
         on_fail: ta.Optional[ta.Callable[[BaseException], None]] = None,
         exception: ta.Union[ta.Type[BaseException], ta.Tuple[ta.Type[BaseException], ...]] = (ConnectionRefusedError,),
 ) -> bool:
@@ -36,7 +36,7 @@ def socket_can_connect(
 def socket_wait_until_can_connect(
         address: ta.Any,
         *,
-        timeout: ta.Optional[TimeoutLike] = None,
+        timeout: TimeoutLike = None,
         on_fail: ta.Optional[ta.Callable[[BaseException], None]] = None,
         sleep_s: float = .1,
         exception: ta.Union[ta.Type[BaseException], ta.Tuple[ta.Type[BaseException], ...]] = (ConnectionRefusedError,),

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/specs/jsonrpc/conns.py

@@ -1,14 +1,12 @@
-"""
-TODO:
- - kill receive loop on __aexit__
-"""
 import builtins
+import functools
 import json
 import typing as ta
 import uuid
 
 import anyio.abc
 
+from ... import check
 from ... import lang
 from ... import marshal as msh
 from ...asyncs import anyio as aiu
@@ -54,8 +52,8 @@ class JsonrpcConnection:
         self._buf = DelimitingBuffer(b'\n')
         self._response_futures_by_id: dict[Id, aiu.Future[Response]] = {}
         self._send_lock = anyio.Lock()
+        self._shutdown_event = anyio.Event()
         self._received_eof = False
-        self._running = True
 
     #
 
@@ -78,7 +76,7 @@ class JsonrpcConnection:
         return self
 
     async def __aexit__(self, exc_type: type[BaseException] | None, *_: object) -> None:
-        self._running = False
+        self._shutdown_event.set()
 
     ##
 
@@ -116,12 +114,28 @@ class JsonrpcConnection:
     )
 
     async def _receive_message_batch(self) -> list[Message] | None:
-        if self._received_eof:
+        check.state(not self._received_eof)
+
+        if self._shutdown_event.is_set():
             return None
 
         while True:
+            maybe_shutdown: lang.Maybe[bool]
+            maybe_data: lang.Maybe[lang.Outcome[bytes]]
+            (
+                maybe_shutdown,
+                maybe_data,
+            ) = await aiu.gather(  # type: ignore
+                self._shutdown_event.wait,
+                functools.partial(lang.acapture, self._stream.receive),
+                take_first=True,
+            )
+
+            if self._shutdown_event.is_set():
+                return None
+
             try:
-                data = await self._stream.receive()
+                data = maybe_data.must().unwrap()
             except self.CLOSED_EXCEPTIONS:
                 data = b''
             except self.ERROR_EXCEPTIONS as e:
@@ -164,7 +178,7 @@ class JsonrpcConnection:
     ) -> None:
         task_status.started()
 
-        while self._running:
+        while not self._shutdown_event.is_set():
             msgs = await self._receive_message_batch()
             if msgs is None:
                 break
@@ -188,7 +202,7 @@ class JsonrpcConnection:
             method: str,
             params: Object | None = None,
             *,
-            timeout: float | None = None,
+            timeout: lang.TimeoutLike | None = lang.Timeout.DEFAULT,
     ) -> ta.Any:
         msg_id = _create_id()
         req = request(msg_id, method, params)
@@ -199,9 +213,9 @@ class JsonrpcConnection:
         try:
             await self.send_message(req)
 
-            timeout_val = timeout if timeout is not None else self._default_timeout
+            timeout_val = lang.Timeout.of(timeout, self._default_timeout)
             try:
-                with anyio.fail_after(timeout_val):
+                with anyio.fail_after(timeout_val.or_(None)):
                     await fut
             except TimeoutError as e:
                 raise JsonrpcConnection.TimeoutError(f'Request timed out after {timeout_val} seconds') from e

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/subprocesses/async_.py

@@ -22,7 +22,7 @@ class AbstractAsyncSubprocesses(BaseSubprocesses):
             self,
             *cmd: str,
             input: ta.Any = None,  # noqa
-            timeout: ta.Optional[TimeoutLike] = None,
+            timeout: TimeoutLike = None,
             check: bool = False,
             capture_output: ta.Optional[bool] = None,
             **kwargs: ta.Any,

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/subprocesses/run.py

@@ -31,7 +31,7 @@ class SubprocessRunOutput(ta.Generic[T]):
 class SubprocessRun:
     cmd: ta.Sequence[str]
     input: ta.Any = None
-    timeout: ta.Optional[TimeoutLike] = None
+    timeout: TimeoutLike = None
     check: bool = False
     capture_output: ta.Optional[bool] = None
     kwargs: ta.Optional[ta.Mapping[str, ta.Any]] = None
@@ -67,7 +67,7 @@ class SubprocessRun:
             cls,
             *cmd: str,
             input: ta.Any = None,  # noqa
-            timeout: ta.Optional[TimeoutLike] = None,
+            timeout: TimeoutLike = None,
             check: bool = False,  # noqa
             capture_output: ta.Optional[bool] = None,
             **kwargs: ta.Any,

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/omlish/subprocesses/sync.py

@@ -28,7 +28,7 @@ class AbstractSubprocesses(BaseSubprocesses, abc.ABC):
             self,
             *cmd: str,
             input: ta.Any = None,  # noqa
-            timeout: ta.Optional[TimeoutLike] = None,
+            timeout: TimeoutLike = None,
             check: bool = False,
             capture_output: ta.Optional[bool] = None,
             **kwargs: ta.Any,

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev308
+Version: 0.0.0.dev309
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev308 → omlish-0.0.0.dev309}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev308'
+version = '0.0.0.dev309'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',