omlish 0.0.0.dev308__py3-none-any.whl → 0.0.0.dev310__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev308'
-__revision__ = '78cf17d1a6de1ee32440b0b62de28fdd17f9bedc'
+__version__ = '0.0.0.dev310'
+__revision__ = '7f687bb413cb71d3946d96c270694e90141e72e3'
 
 
 #

omlish/antlr/delimit.py

@@ -6,6 +6,9 @@ from .. import check
 from . import runtime as antlr4
 
 
+##
+
+
 class DelimitingLexer(antlr4.Lexer):
     def __init__(
             self,

omlish/antlr/dot.py

@@ -5,6 +5,9 @@ from . import runtime as antlr4
 from .utils import yield_contexts
 
 
+##
+
+
 def dot_ctx(
         root: antlr4.ParserRuleContext,
         *,

omlish/antlr/errors.py

@@ -2,6 +2,9 @@
 from . import runtime as antlr4
 
 
+##
+
+
 class ParseError(Exception):
     pass
 

omlish/antlr/parsing.py

@@ -10,6 +10,9 @@ LexerT = ta.TypeVar('LexerT', bound=antlr4.Lexer)
 ParserT = ta.TypeVar('ParserT', bound=antlr4.Parser)
 
 
+##
+
+
 def is_eof_context(ctx: antlr4.ParserRuleContext) -> bool:
     return ctx.getChildCount() == 1 and ctx.getChild(0).getSymbol().type == antlr4.Token.EOF
 

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/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/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/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/formats/toml/parser.py

@@ -156,29 +156,37 @@ class TomlFlags:
     def set(self, key: TomlKey, flag: int, *, recursive: bool) -> None:  # noqa: A003
         cont = self._flags
         key_parent, key_stem = key[:-1], key[-1]
+
         for k in key_parent:
             if k not in cont:
                 cont[k] = {'flags': set(), 'recursive_flags': set(), 'nested': {}}
             cont = cont[k]['nested']
+
         if key_stem not in cont:
             cont[key_stem] = {'flags': set(), 'recursive_flags': set(), 'nested': {}}
+
         cont[key_stem]['recursive_flags' if recursive else 'flags'].add(flag)
 
     def is_(self, key: TomlKey, flag: int) -> bool:
         if not key:
             return False  # document root has no flags
+
         cont = self._flags
         for k in key[:-1]:
             if k not in cont:
                 return False
+
             inner_cont = cont[k]
             if flag in inner_cont['recursive_flags']:
                 return True
+
             cont = inner_cont['nested']
+
         key_stem = key[-1]
         if key_stem in cont:
             cont = cont[key_stem]
             return flag in cont['flags'] or flag in cont['recursive_flags']
+
         return False
 
 
@@ -196,24 +204,31 @@ class TomlNestedDict:
             access_lists: bool = True,
     ) -> dict:
         cont: ta.Any = self.dict
+
         for k in key:
             if k not in cont:
                 cont[k] = {}
+
             cont = cont[k]
+
             if access_lists and isinstance(cont, list):
                 cont = cont[-1]
+
             if not isinstance(cont, dict):
                 raise KeyError('There is no nest behind this key')
+
         return cont
 
     def append_nest_to_list(self, key: TomlKey) -> None:
         cont = self.get_or_create_nest(key[:-1])
+
         last_key = key[-1]
         if last_key in cont:
             list_ = cont[last_key]
             if not isinstance(list_, list):
                 raise KeyError('An object other than list found behind this key')
             list_.append({})
+
         else:
             cont[last_key] = [{}]
 
@@ -283,23 +298,30 @@ class TomlParser:
                 char = self.src[self.pos]
             except IndexError:
                 break
+
             if char == '\n':
                 self.pos += 1
                 continue
+
             if char in self.KEY_INITIAL_CHARS:
                 self.key_value_rule(header)
                 self.skip_chars(self.WS)
+
             elif char == '[':
                 try:
                     second_char: ta.Optional[str] = self.src[self.pos + 1]
                 except IndexError:
                     second_char = None
+
                 self.flags.finalize_pending()
+
                 if second_char == '[':
                     header = self.create_list_rule()
                 else:
                     header = self.create_dict_rule()
+
                 self.skip_chars(self.WS)
+
             elif char != '#':
                 raise self.suffixed_err('Invalid statement')
 
@@ -311,8 +333,10 @@ class TomlParser:
                 char = self.src[self.pos]
             except IndexError:
                 break
+
             if char != '\n':
                 raise self.suffixed_err('Expected newline or end of document after a statement')
+
             self.pos += 1
 
         return self.data.dict
@@ -341,7 +365,9 @@ class TomlParser:
         if not error_on.isdisjoint(self.src[self.pos:new_pos]):
             while self.src[self.pos] not in error_on:
                 self.pos += 1
+
             raise self.suffixed_err(f'Found invalid character {self.src[self.pos]!r}')
+
         self.pos = new_pos
 
     def skip_comment(self) -> None:
@@ -349,6 +375,7 @@ class TomlParser:
             char: ta.Optional[str] = self.src[self.pos]
         except IndexError:
             char = None
+
         if char == '#':
             self.pos += 1
             self.skip_until(
@@ -372,7 +399,9 @@ class TomlParser:
 
         if self.flags.is_(key, TomlFlags.EXPLICIT_NEST) or self.flags.is_(key, TomlFlags.FROZEN):
             raise self.suffixed_err(f'Cannot declare {key} twice')
+
         self.flags.set(key, TomlFlags.EXPLICIT_NEST, recursive=False)
+
         try:
             self.data.get_or_create_nest(key)
         except KeyError:
@@ -380,20 +409,25 @@ class TomlParser:
 
         if not self.src.startswith(']', self.pos):
             raise self.suffixed_err("Expected ']' at the end of a table declaration")
+
         self.pos += 1
         return key
 
     def create_list_rule(self) -> TomlKey:
         self.pos += 2  # Skip "[["
         self.skip_chars(self.WS)
+
         key = self.parse_key()
 
         if self.flags.is_(key, TomlFlags.FROZEN):
             raise self.suffixed_err(f'Cannot mutate immutable namespace {key}')
+
         # Free the namespace now that it points to another empty list item...
         self.flags.unset_all(key)
+
         # ...but this key precisely is still prohibited from table declaration
         self.flags.set(key, TomlFlags.EXPLICIT_NEST, recursive=False)
+
         try:
             self.data.append_nest_to_list(key)
         except KeyError:
@@ -401,6 +435,7 @@ class TomlParser:
 
         if not self.src.startswith(']]', self.pos):
             raise self.suffixed_err("Expected ']]' at the end of an array declaration")
+
         self.pos += 2
         return key
 
@@ -414,6 +449,7 @@ class TomlParser:
             # Check that dotted key syntax does not redefine an existing table
             if self.flags.is_(cont_key, TomlFlags.EXPLICIT_NEST):
                 raise self.suffixed_err(f'Cannot redefine namespace {cont_key}')
+
             # Containers in the relative path can't be opened with the table syntax or dotted key/value syntax in
             # following table sections.
             self.flags.add_pending(cont_key, TomlFlags.EXPLICIT_NEST)
@@ -425,41 +461,54 @@ class TomlParser:
             nest = self.data.get_or_create_nest(abs_key_parent)
         except KeyError:
             raise self.suffixed_err('Cannot overwrite a value') from None
+
         if key_stem in nest:
             raise self.suffixed_err('Cannot overwrite a value')
+
         # Mark inline table and array namespaces recursively immutable
         if isinstance(value, (dict, list)):
             self.flags.set(header + key, TomlFlags.FROZEN, recursive=True)
+
         nest[key_stem] = value
 
     def parse_key_value_pair(self) -> ta.Tuple[TomlKey, ta.Any]:
         key = self.parse_key()
+
         try:
             char: ta.Optional[str] = self.src[self.pos]
         except IndexError:
             char = None
+
         if char != '=':
             raise self.suffixed_err("Expected '=' after a key in a key/value pair")
+
         self.pos += 1
         self.skip_chars(self.WS)
+
         value = self.parse_value()
         return key, value
 
     def parse_key(self) -> TomlKey:
         key_part = self.parse_key_part()
         key: TomlKey = (key_part,)
+
         self.skip_chars(self.WS)
+
         while True:
             try:
                 char: ta.Optional[str] = self.src[self.pos]
             except IndexError:
                 char = None
+
             if char != '.':
                 return key
+
             self.pos += 1
             self.skip_chars(self.WS)
+
             key_part = self.parse_key_part()
             key += (key_part,)
+
             self.skip_chars(self.WS)
 
     def parse_key_part(self) -> str:
@@ -467,14 +516,18 @@ class TomlParser:
             char: ta.Optional[str] = self.src[self.pos]
         except IndexError:
             char = None
+
         if char in self.BARE_KEY_CHARS:
             start_pos = self.pos
             self.skip_chars(self.BARE_KEY_CHARS)
             return self.src[start_pos:self.pos]
+
         if char == "'":
             return self.parse_literal_str()
+
         if char == '"':
             return self.parse_one_line_basic_str()
+
         raise self.suffixed_err('Invalid initial character for a key part')
 
     def parse_one_line_basic_str(self) -> str:
@@ -489,6 +542,7 @@ class TomlParser:
         if self.src.startswith(']', self.pos):
             self.pos += 1
             return array
+
         while True:
             val = self.parse_value()
             array.append(val)
@@ -498,11 +552,14 @@ class TomlParser:
             if c == ']':
                 self.pos += 1
                 return array
+
             if c != ',':
                 raise self.suffixed_err('Unclosed array')
+
             self.pos += 1
 
             self.skip_comments_and_array_ws()
+
             if self.src.startswith(']', self.pos):
                 self.pos += 1
                 return array
@@ -513,54 +570,72 @@ class TomlParser:
         flags = TomlFlags()
 
         self.skip_chars(self.WS)
+
         if self.src.startswith('}', self.pos):
             self.pos += 1
             return nested_dict.dict
+
         while True:
             key, value = self.parse_key_value_pair()
             key_parent, key_stem = key[:-1], key[-1]
+
             if flags.is_(key, TomlFlags.FROZEN):
                 raise self.suffixed_err(f'Cannot mutate immutable namespace {key}')
+
             try:
                 nest = nested_dict.get_or_create_nest(key_parent, access_lists=False)
             except KeyError:
                 raise self.suffixed_err('Cannot overwrite a value') from None
+
             if key_stem in nest:
                 raise self.suffixed_err(f'Duplicate inline table key {key_stem!r}')
+
             nest[key_stem] = value
             self.skip_chars(self.WS)
+
             c = self.src[self.pos:self.pos + 1]
             if c == '}':
                 self.pos += 1
                 return nested_dict.dict
+
             if c != ',':
                 raise self.suffixed_err('Unclosed inline table')
+
             if isinstance(value, (dict, list)):
                 flags.set(key, TomlFlags.FROZEN, recursive=True)
+
             self.pos += 1
             self.skip_chars(self.WS)
 
     def parse_basic_str_escape(self, multiline: bool = False) -> str:
         escape_id = self.src[self.pos:self.pos + 2]
         self.pos += 2
+
         if multiline and escape_id in {'\\ ', '\\\t', '\\\n'}:
             # Skip whitespace until next non-whitespace character or end of the doc. Error if non-whitespace is found
             # before newline.
             if escape_id != '\\\n':
                 self.skip_chars(self.WS)
+
                 try:
                     char = self.src[self.pos]
                 except IndexError:
                     return ''
+
                 if char != '\n':
                     raise self.suffixed_err("Unescaped '\\' in a string")
+
                 self.pos += 1
+
             self.skip_chars(self.WS_AND_NEWLINE)
             return ''
+
         if escape_id == '\\u':
             return self.parse_hex_char(4)
+
         if escape_id == '\\U':
             return self.parse_hex_char(8)
+
         try:
             return self.BASIC_STR_ESCAPE_REPLACEMENTS[escape_id]
         except KeyError:
@@ -575,12 +650,16 @@ class TomlParser:
 
     def parse_hex_char(self, hex_len: int) -> str:
         hex_str = self.src[self.pos:self.pos + hex_len]
+
         if len(hex_str) != hex_len or not self.HEXDIGIT_CHARS.issuperset(hex_str):
             raise self.suffixed_err('Invalid hex value')
+
         self.pos += hex_len
         hex_int = int(hex_str, 16)
+
         if not self.is_unicode_scalar_value(hex_int):
             raise self.suffixed_err('Escaped character is not a Unicode scalar value')
+
         return chr(hex_int)
 
     def parse_literal_str(self) -> str:
@@ -606,6 +685,7 @@ class TomlParser:
             )
             result = self.src[start_pos:self.pos]
             self.pos += 3
+
         else:
             delim = '"'
             result = self.parse_basic_str(multiline=True)
@@ -613,9 +693,11 @@ class TomlParser:
         # Add at maximum two extra apostrophes/quotes if the end sequence is 4 or 5 chars long instead of just 3.
         if not self.src.startswith(delim, self.pos):
             return result
+
         self.pos += 1
         if not self.src.startswith(delim, self.pos):
             return result + delim
+
         self.pos += 1
         return result + (delim * 2)
 
@@ -626,6 +708,7 @@ class TomlParser:
         else:
             error_on = self.ILLEGAL_BASIC_STR_CHARS
             parse_escapes = self.parse_basic_str_escape
+
         result = ''
         start_pos = self.pos
         while True:
@@ -633,25 +716,31 @@ class TomlParser:
                 char = self.src[self.pos]
             except IndexError:
                 raise self.suffixed_err('Unterminated string') from None
+
             if char == '"':
                 if not multiline:
                     end_pos = self.pos
                     self.pos += 1
                     return result + self.src[start_pos:end_pos]
+
                 if self.src.startswith('"""', self.pos):
                     end_pos = self.pos
                     self.pos += 3
                     return result + self.src[start_pos:end_pos]
+
                 self.pos += 1
                 continue
+
             if char == '\\':
                 result += self.src[start_pos:self.pos]
                 parsed_escape = parse_escapes()
                 result += parsed_escape
                 start_pos = self.pos
                 continue
+
             if char in error_on:
                 raise self.suffixed_err(f'Illegal character {char!r}')
+
             self.pos += 1
 
     def parse_value(self) -> ta.Any:  # noqa: C901
@@ -679,6 +768,7 @@ class TomlParser:
             if self.src.startswith('true', self.pos):
                 self.pos += 4
                 return True
+
         if char == 'f':
             if self.src.startswith('false', self.pos):
                 self.pos += 5
@@ -699,8 +789,10 @@ class TomlParser:
                 datetime_obj = self.match_to_datetime(datetime_match)
             except ValueError as e:
                 raise self.suffixed_err('Invalid date or datetime') from e
+
             self.pos = datetime_match.end()
             return datetime_obj
+
         localtime_match = self.RE_LOCALTIME.match(self.src, self.pos)
         if localtime_match:
             self.pos = localtime_match.end()
@@ -718,6 +810,7 @@ class TomlParser:
         if first_three in {'inf', 'nan'}:
             self.pos += 3
             return self.parse_float(first_three)
+
         first_four = self.src[self.pos:self.pos + 4]
         if first_four in {'-inf', '+inf', '-nan', '+nan'}:
             self.pos += 4
@@ -728,11 +821,13 @@ class TomlParser:
     def coord_repr(self, pos: TomlPos) -> str:
         if pos >= len(self.src):
             return 'end of document'
+
         line = self.src.count('\n', 0, pos) + 1
         if line == 1:
             column = pos + 1
         else:
             column = pos - self.src.rindex('\n', 0, pos)
+
         return f'line {line}, column {column}'
 
     def suffixed_err(self, msg: str, *, pos: ta.Optional[TomlPos] = None) -> TomlDecodeError:
@@ -799,11 +894,16 @@ class TomlParser:
             offset_hour_str,
             offset_minute_str,
         ) = match.groups()
+
         year, month, day = int(year_str), int(month_str), int(day_str)
+
         if hour_str is None:
             return datetime.date(year, month, day)
+
         hour, minute, sec = int(hour_str), int(minute_str), int(sec_str)
+
         micros = int(micros_str.ljust(6, '0')) if micros_str else 0
+
         if offset_sign_str:
             tz: ta.Optional[datetime.tzinfo] = toml_cached_tz(
                 offset_hour_str, offset_minute_str, offset_sign_str,
@@ -812,6 +912,7 @@ class TomlParser:
             tz = datetime.UTC
         else:  # local date-time
             tz = None
+
         return datetime.datetime(year, month, day, hour, minute, sec, micros, tzinfo=tz)
 
     @classmethod

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/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/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/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/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/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/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/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.dist-info → omlish-0.0.0.dev310.dist-info}/METADATA

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

{omlish-0.0.0.dev308.dist-info → omlish-0.0.0.dev310.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=8uwTWCC1I_m-H13aDRaDT3swnjnC8reB6e7B8azZYSA,3478
+omlish/__about__.py,sha256=ntivrO3CNCin3JSqT6Sg7-V7nFZmB_9KZbxtFU9MJwk,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -18,11 +18,11 @@ omlish/algorithm/distribute.py,sha256=kO60F7HtMF3j-IxuhJdtsfgIR1Vpf1okQfacb4eNuk
 omlish/algorithm/toposort.py,sha256=cE-zouEVhX05jwGl86JhxB2qgqw5DfQRqpZFR89j7NY,888
 omlish/algorithm/unify.py,sha256=xUvisdtU8L9uMWt--_osYksJjVBlwxLOLvtdDmFGDDo,833
 omlish/antlr/__init__.py,sha256=88bMl_28cfSKslgOkMGYXqALgsHz3KC4LFvAVtzj7k8,89
-omlish/antlr/delimit.py,sha256=3Byvh9_Ip8ftM_SeSEmMbnNo1jrxk-xm8HnHDp_nDaI,3466
-omlish/antlr/dot.py,sha256=W9cgprtAZH6EjUkzWfSbx2XUUYRYLLxFofGWrUp-368,956
-omlish/antlr/errors.py,sha256=foYz2109WReT1C7qZsIrb4zCAkZg4vM_UiDOAPC0AqQ,308
+omlish/antlr/delimit.py,sha256=swvxJcECG2e5I3IK62NNbJ7hpLYABRAZUwd2-G9BLtE,3471
+omlish/antlr/dot.py,sha256=LFVo3YYPoLMHMEEUsQepl9zXL1yukNJbqv6Q9E_04qw,961
+omlish/antlr/errors.py,sha256=4J0WuVKbeFoZEP0wePCmn-e7mI1VMwWoE3wkeQO-4nk,313
 omlish/antlr/input.py,sha256=baeO279AIxR50pymya0eabtnc2A0bSdA5u7jvIGebzA,2090
-omlish/antlr/parsing.py,sha256=kXxeGb5luiwhSyIcXO2mLLME7IJLF6-0XMuS4UcDbcw,1414
+omlish/antlr/parsing.py,sha256=SFywjYFvrIhkqNHsxY7YNgYHSV6vlk98zjH0hN6UVhA,1419
 omlish/antlr/runtime.py,sha256=wYUiJ0qoj4soHFL6fsq91MnUrDSKUEQVmJScKJibOAc,1975
 omlish/antlr/utils.py,sha256=hi_RFUl222r2gQsmmm5MYg5_vYa3q8u-KP4CC1ZHndA,912
 omlish/antlr/_runtime/BufferedTokenStream.py,sha256=1Rnhm62MZCWSuQeRs7lRUbdtdyo7Gyg8r4gAETjv-cE,10793
@@ -108,10 +108,10 @@ omlish/asyncs/anyio/utils.py,sha256=X2Rz1DGrCJ0zkt1O5cHoMRaYKTPndBj6dzLhb09mVtE,
 omlish/asyncs/asyncio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/asyncs/asyncio/all.py,sha256=u2JpMEs-0AJ0Vd8yU10HvWD8rfKxdFfMiwBu2oDeuuQ,313
 omlish/asyncs/asyncio/channels.py,sha256=X3S951YTjTRDguMSQRlfu74mPuWkNd2ZEUWboLY58-M,1079
-omlish/asyncs/asyncio/sockets.py,sha256=oZAPeC545MGeSpVj_uQfy-BbzXsXHesjCkJSiuqKmAI,1271
+omlish/asyncs/asyncio/sockets.py,sha256=QdXWswN9p9jOlaXUSYnCQZtwu1_jSQNWBiKPt6bws6o,1258
 omlish/asyncs/asyncio/streams.py,sha256=J_d1hgX4Mx9SfyW4DjOzh91PqzZmjOtiIB95ytF8Ygw,1009
-omlish/asyncs/asyncio/subprocesses.py,sha256=Ob5oiyue-YYpvQktzI54QpGsl8E0xEKFOVcb_atJ_R8,6935
-omlish/asyncs/asyncio/timeouts.py,sha256=LwFx93KSrefBobQoK4-yH5B6M-pbd7NdNksNzLBfLgQ,459
+omlish/asyncs/asyncio/subprocesses.py,sha256=Mvy5cXHbY-JB5Yl57G05c2O7aEMAjSe29Ed_J63pvx0,6896
+omlish/asyncs/asyncio/timeouts.py,sha256=c-DhZi0yFXhJ6NtHa4EhB1Vrr1QDVd-7HBRkr96Q2So,446
 omlish/asyncs/asyncio/utils.py,sha256=mDjYNm1cylUhQ8slWXwdPoXasuWfafjzu78GHt2Mdig,2437
 omlish/asyncs/bluelet/LICENSE,sha256=VHf3oPQihOHnWyIR8LcXX0dpONa1lgyJnjWC2qVuRR0,559
 omlish/asyncs/bluelet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -195,7 +195,7 @@ omlish/configs/processing/names.py,sha256=weHmaTclzgM9lUn3aBtw-kwZ3mc2N-CZlFg3Kd
 omlish/configs/processing/rewriting.py,sha256=v7PfHtuTn5v_5Y6Au7oMN2Z0nxAMy1iYyO5CXnTvZhs,4226
 omlish/configs/processing/strings.py,sha256=qFS2oh6z02IaM_q4lTKLdufzkJqAJ6J-Qjrz5S-QJoM,826
 omlish/daemons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/daemons/daemon.py,sha256=3Wkvu8M_EaCKSpKI5UN5OayRXV0oVdF62tBss9_hlr0,3479
+omlish/daemons/daemon.py,sha256=pUwomapIrUwXLnov9jlA5EU1vp4qEYcIiUxKD3SQyVo,3479
 omlish/daemons/launching.py,sha256=sNOYW939IGI4ZlLQ0bKxzXj6EyeOiwV7Upqhd5XfoHc,3747
 omlish/daemons/reparent.py,sha256=7uJ9oPGt9Ud7uA8bDl_SHcuqjcsmXa3kkjp9jf29wOw,585
 omlish/daemons/services.py,sha256=YYp2SMkJ71WgzOcYSXjWHeAyKKxu3j1dfuJvWkl0Dgw,3492
@@ -362,7 +362,7 @@ omlish/formats/json5/_antlr/Json5Visitor.py,sha256=SfHhUMNapeP8g4Dc7SFwRSqeBtUTL
 omlish/formats/json5/_antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/toml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/toml/codec.py,sha256=5HFGWEPd9IFxPlRMRheX8FEDlRIzLe1moHEOj2_PFKU,342
-omlish/formats/toml/parser.py,sha256=c6Hrf6OfVQVtgsYUXL5P5PQQqF-v7r8nkUmprxhV-lI,30536
+omlish/formats/toml/parser.py,sha256=0laC7Br_Colk8QxgmuU_pPg6fhcAQ2rMB2saSlLm9S0,30637
 omlish/formats/toml/writer.py,sha256=HIp6XvriXaPTLqyLe-fkIiEf1Pyhsp0TcOg5rFBpO3g,3226
 omlish/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/funcs/genmachine.py,sha256=8K5fNvFwxctZcVyulOqPLhZ_6Nwh8RAN6yawiE4wFio,2606
@@ -529,7 +529,7 @@ omlish/lite/resources.py,sha256=YNSmX1Ohck1aoWRs55a-o5ChVbFJIQhtbqE-XwF55Oc,326
 omlish/lite/runtime.py,sha256=XQo408zxTdJdppUZqOWHyeUR50VlCpNIExNGHz4U6O4,459
 omlish/lite/secrets.py,sha256=3Mz3V2jf__XU9qNHcH56sBSw95L3U2UPL24bjvobG0c,816
 omlish/lite/strings.py,sha256=QGxT1Yh4oI8ycsfeobxnjEhvDob_GiAKLeIhZwo1j24,1986
-omlish/lite/timeouts.py,sha256=lhXo0zwpLM7nr2-AliBRui2BO9jh7B8ALxetwOq6hYI,4968
+omlish/lite/timeouts.py,sha256=NX7gfW4FLYBcewMh4Dg_XlWqJkLY1Fom3z_OLSzuK7M,4969
 omlish/lite/timing.py,sha256=aVu3hEDB_jyTF_ryZI7iU-xg4q8CNwqpp9Apfru_iwY,196
 omlish/lite/types.py,sha256=fP5EMyBdEp2LmDxcHjUDtwAMdR06ISr9lKOL7smWfHM,140
 omlish/lite/typing.py,sha256=U3-JaEnkDSYxK4tsu_MzUn3RP6qALBe5FXQXpD-licE,1090
@@ -627,7 +627,7 @@ omlish/os/pidfiles/__main__.py,sha256=AF8TwjK4xgHVnoLAP9dIWgKvT0vGhHJlfDW0tKZ7tx
 omlish/os/pidfiles/cli.py,sha256=2SSsP4O3VdpsDIMAkWgWSjh_YNIPzCD9l5LNN2qrIjo,2074
 omlish/os/pidfiles/manager.py,sha256=QphQxIENVVwvBWynLCNU31NwOfLkV43VoTVeYFn2Hac,2351
 omlish/os/pidfiles/pidfile.py,sha256=9tI5IMVwfPfnni0XMn4x5ptNQgm36n8tLeUNPf50UqU,4394
-omlish/os/pidfiles/pinning.py,sha256=v9RlJ4BnJZcaZZXiiRqbmzLluaSOkeeEb_WrbKEClBQ,6643
+omlish/os/pidfiles/pinning.py,sha256=aQgCmvcAqN0lvI70GcSB2TKVX1G4vwbyN_AOHF3-eKE,6630
 omlish/reflect/__init__.py,sha256=64eHbD6zL6Fhp7FfXb8n9ZHywlODjBN3rm1LMvZ081A,822
 omlish/reflect/inspect.py,sha256=WCo2YpBYauKw6k758FLlZ_H4Q05rgVPs96fEv9w6zHQ,1538
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
@@ -649,8 +649,8 @@ omlish/sockets/addresses.py,sha256=vbVeQBkzI513H4vRv-JS89QtRbr9U8v5zqkm3oODl_s,1
 omlish/sockets/bind.py,sha256=J1SfFFFnVf3H5nqESDX2NGEY8DmjyIMUXZciZM33zQY,8003
 omlish/sockets/handlers.py,sha256=Gj6xZoo4vommge8XvkehYw3B7O4aql2P4qzZIIa0p24,462
 omlish/sockets/io.py,sha256=lfhTkB7NnAIx9kuQhAkwgsEUXY78Mp1_WtYrIQNS_k8,1408
-omlish/sockets/ports.py,sha256=Wm4mRFFz5MdD8KbdaEfT1c4PbJnsuK_iyJlZJE_-8jo,1402
-omlish/sockets/wait.py,sha256=aznyOzGa9oNBc31xnyk1S7TylO8hGx7vFyOVsdY3zFE,1585
+omlish/sockets/ports.py,sha256=NQYVvd8IBbQkPl8TnBtupTiv-Htqhc6QBIXJJ6GprnQ,1389
+omlish/sockets/wait.py,sha256=OtLbcoLYzksl4GU0TNbQpzzVWGxp2iRLgo2cGZZfFFM,1559
 omlish/sockets/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/sockets/server/handlers.py,sha256=PPsb1X5oU9dN8jfztaMGsRiqWTyEANT-1aSLbS6bUVg,3867
 omlish/sockets/server/server.py,sha256=FkaishIxJuU4it9tTI7wzlGqJYzFGXzDrd_HgV0jAmU,6253
@@ -689,7 +689,7 @@ omlish/specs/jmespath/parser.py,sha256=yfkydotVR4LBhrUTsptL_kLYDoGZrRN9zSEs_76kv
 omlish/specs/jmespath/scope.py,sha256=UyDsl9rv_c8DCjJBuVIA2ESu1jrgYvuwEKiaJDQKnT0,1590
 omlish/specs/jmespath/visitor.py,sha256=HVro_6aBGL0CMBy8NRy6vJzWgwsHGB1qJXldX8H7wSg,16592
 omlish/specs/jsonrpc/__init__.py,sha256=ugIdqHXWZjSy1R1SkwoxstO2GCHEF4W95Ogl3_5_DV4,544
-omlish/specs/jsonrpc/conns.py,sha256=Js7DnC48mdnO56-A3wIsgc5ri8CbpAC53USD43eTQSw,6453
+omlish/specs/jsonrpc/conns.py,sha256=zvWnBHuSoGnvbGVk72Usp4IFsLscrzPozqR2hmFjnDI,7029
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
 omlish/specs/jsonrpc/marshal.py,sha256=HM736piPGnBZrg8CMLDX-L5fZpegyF6l6JUjzLoSDtk,1852
 omlish/specs/jsonrpc/types.py,sha256=Se9ecG-_k-kY_Qlt9QD2t3y26oY4sXTcskp6XZfVans,3054
@@ -787,11 +787,11 @@ omlish/sql/tabledefs/lower.py,sha256=YQf8gl1kxD5Fm-vOxV6G0Feh_D9PP1pYwz_vz6XjTPQ
 omlish/sql/tabledefs/marshal.py,sha256=x8XG0fJLQ6hlwyu957xqnUhr71ouKiRGBWVueZUEMZU,470
 omlish/sql/tabledefs/tabledefs.py,sha256=lIhvlt0pk6G7RZAtDFsFXm5j0l9BvRfnP7vNGeydHtE,816
 omlish/subprocesses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/subprocesses/async_.py,sha256=hPQTWFa3k5CE_s9p1JTY4KdTPOsqLJtq3lGMRznrVpY,2373
+omlish/subprocesses/async_.py,sha256=st7452hRImm6dCwD-Cf293VPeB50xxc8sk_EoRNe_fY,2360
 omlish/subprocesses/base.py,sha256=W6El-PUKKF9KLAks5LB6kzqs_n3FfkblJ-JOv6NFQbY,6133
 omlish/subprocesses/editor.py,sha256=tVU1EQsEhCM242HheylQvEsqaAZYnT61kMhlzZcdk5U,2628
-omlish/subprocesses/run.py,sha256=3jwSnQJvFMDMHmJvtAkrrK5D-i7_8cw12vX84EWTuJo,3668
-omlish/subprocesses/sync.py,sha256=HKmKM99_Y7tkJRg_n5onXrw41IZt5M5fqU0281LY-mo,3671
+omlish/subprocesses/run.py,sha256=ViFvLJYQHAExk0novi8wCx4xk7T4WPH6CTT3P55B6-4,3642
+omlish/subprocesses/sync.py,sha256=Lmr6LYQrH37wVnlYRQc-fk4iENn2zFGxJmiU8-biUEQ,3658
 omlish/subprocesses/utils.py,sha256=MJb6hvKhZceTmBeFVqlc5oM7rDxWkUzSzK9nKvbIvM8,396
 omlish/subprocesses/wrap.py,sha256=HMvCZrO2H227oGNN03KjB3FI-M5bAICqp19W8oG2f5M,763
 omlish/term/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -853,9 +853,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev308.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev308.dist-info/METADATA,sha256=-f4JyYLhz7RVYUCBHyIx0neYBnC4SadbuFbwS9NKl6E,4416
-omlish-0.0.0.dev308.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-omlish-0.0.0.dev308.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev308.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev308.dist-info/RECORD,,
+omlish-0.0.0.dev310.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev310.dist-info/METADATA,sha256=nL2AYcp2yZlXdDGZI7kx77NdLRrDcwPh868SLgJaUeY,4416
+omlish-0.0.0.dev310.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+omlish-0.0.0.dev310.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev310.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev310.dist-info/RECORD,,