omlish 0.0.0.dev307__tar.gz → 0.0.0.dev309__tar.gz

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

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

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

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev307'
-__revision__ = '7fd729bd16b72af663b113712ea301f150b2449d'
+__version__ = '0.0.0.dev309'
+__revision__ = '1304f03bec6edcdf467784eeceb7c0e00a7ec49c'
 
 
 #

{omlish-0.0.0.dev307 → omlish-0.0.0.dev309}/omlish/asyncs/anyio/subprocesses.py

@@ -50,11 +50,11 @@ class AnyioSubprocesses(AbstractAsyncSubprocesses):
                         stderr = io.BytesIO()
                         tg.start_soon(read_output, proc.stderr, stderr)
 
-                if proc.stdin and run.input is not None:
-                    await proc.stdin.send(run.input)
-                    await proc.stdin.aclose()
+                    if proc.stdin and run.input is not None:
+                        await proc.stdin.send(run.input)
+                        await proc.stdin.aclose()
 
-                await proc.wait()
+                    await proc.wait()
 
         if run.check and proc.returncode != 0:
             raise subprocess.CalledProcessError(

{omlish-0.0.0.dev307 → 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.dev307 → 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.dev307 → 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.dev307 → 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.dev307 → omlish-0.0.0.dev309}/omlish/formats/edn/lexing.py

@@ -32,6 +32,8 @@ TokenKind: ta.TypeAlias = ta.Literal[
     'HASH_UNDERSCORE',
     'META',
     'QUOTE',
+
+    'SPACE',
 ]
 
 
@@ -88,7 +90,13 @@ class StreamLexError(Exception):
 
 
 class StreamLexer(GenMachine[str, Token]):
-    def __init__(self) -> None:
+    def __init__(
+            self,
+            *,
+            include_space: bool = False,
+    ) -> None:
+        self._include_space = include_space
+
         self._ofs = 0
         self._line = 1
         self._col = 0
@@ -155,6 +163,8 @@ class StreamLexer(GenMachine[str, Token]):
                 return None
 
             if c.isspace() or c == ',':
+                if self._include_space:
+                    yield self._make_tok('SPACE', c, self.pos)
                 continue
 
             if c in SINGLE_TOKENS:
@@ -303,23 +313,3 @@ class StreamLexer(GenMachine[str, Token]):
         src = self._flip_buf()
         yield self._make_tok('WORD', src, pos)
         return self._do_main(c)
-
-
-##
-
-
-def test_lex():
-    for s in [
-        '"abc"',
-        '{"a" "b"}',
-        '1',
-        '-1',
-        '{a :b c 420}',
-        '#{a}',
-    ]:
-        print(s)
-        with StreamLexer() as lex:
-            for c in [*s, '']:
-                for t in lex(c):
-                    print(t)
-        print()

{omlish-0.0.0.dev307 → omlish-0.0.0.dev309}/omlish/formats/edn/parsing.py

@@ -178,10 +178,15 @@ class StreamParser(GenMachine[Token, ta.Any]):
                 else:
                     raise
 
-            value: ta.Any
+            # ignored
+
+            if tok.kind in ('SPACE', 'COMMENT'):
+                continue
 
             # scalars
 
+            value: ta.Any
+
             if tok.kind == 'STRING':
                 value = self._parse_string(tok)
 
@@ -197,9 +202,6 @@ class StreamParser(GenMachine[Token, ta.Any]):
                 else:
                     value = self._parse_word(tok)
 
-            elif tok.kind == 'COMMENT':
-                continue
-
             # open
 
             elif tok.kind == 'LPAREN':
@@ -324,8 +326,7 @@ class StreamParser(GenMachine[Token, ta.Any]):
 
         return self._char_maker(c)
 
-    _INT_PAT = re.compile(r'[-+]?(0|[1-9][0-9]*)')
-    _BIGINT_PAT = re.compile(r'[-+]?(0|[1-9][0-9]*)N')
+    _INT_PAT = re.compile(r'[-+]?(0|[1-9][0-9]*)N?')
     _FLOAT_PAT = re.compile(r'[-+]?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?(0|[1-9][0-9]*))?M?')
 
     def _parse_word(self, tok: Token) -> ta.Any:
@@ -345,10 +346,11 @@ class StreamParser(GenMachine[Token, ta.Any]):
             # 2r101010, 052, 8r52, 0x2a, 36r16, and 42 are all the same Long.
             # Floating point numbers are read as Doubles; with M suffix they are read as BigDecimals.
             # Ratios are supported, e.g. 22/7.
-            return int(src)
+            if src.endswith('N'):
+                return int(src[:-1])
 
-        elif self._BIGINT_PAT.fullmatch(src):
-            return int(src[:-1])
+            else:
+                return int(src)
 
         elif self._FLOAT_PAT.fullmatch(src):
             return float(src)
@@ -376,25 +378,3 @@ def parse(src: str, **kwargs: ta.Any) -> ta.Any | None:
     if not values:
         return None
     return check.single(values)
-
-
-##
-
-
-def test_parse():
-    for s in [
-        '"abc"',
-        '"a\\bc"',
-        '{"a" "b"}',
-        '1',
-        '-1',
-        '{a :b c 420}',
-        '#{a}',
-        '(1 #_ 2 3)',
-        '"foo\u1234bar"',
-        '\\x',
-        '\\u1234',
-    ]:
-        print(s)
-        print(parse(s))
-        print()

{omlish-0.0.0.dev307 → omlish-0.0.0.dev309}/omlish/formats/json/stream/lexing.py

@@ -40,7 +40,14 @@ ControlTokenKind: ta.TypeAlias = ta.Literal[
     'COLON',
 ]
 
-TokenKind: ta.TypeAlias = ValueTokenKind | ControlTokenKind
+SpaceTokenKind: ta.TypeAlias = ta.Literal['SPACE']
+
+TokenKind: ta.TypeAlias = ta.Union[  # noqa
+    ValueTokenKind,
+    ControlTokenKind,
+    SpaceTokenKind,
+]
+
 
 #
 
@@ -109,8 +116,10 @@ class JsonStreamLexer(GenMachine[str, Token]):
             self,
             *,
             include_raw: bool = False,
+            include_space: bool = False,
     ) -> None:
         self._include_raw = include_raw
+        self._include_space = include_space
 
         self._ofs = 0
         self._line = 1
@@ -174,6 +183,8 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 return None
 
             if c.isspace():
+                if self._include_space:
+                    yield self._make_tok('SPACE', c, c, self.pos)
                 continue
 
             if c in CONTROL_TOKENS:
@@ -282,7 +293,11 @@ class JsonStreamLexer(GenMachine[str, Token]):
         if c in CONTROL_TOKENS:
             yield self._make_tok(CONTROL_TOKENS[c], c, c, pos)
 
-        elif not c.isspace():
+        elif c.isspace():
+            if self._include_space:
+                yield self._make_tok('SPACE', c, c, self.pos)
+
+        else:
             self._raise(f'Unexpected character after number: {c}')
 
         return self._do_main()

{omlish-0.0.0.dev307 → omlish-0.0.0.dev309}/omlish/formats/json/stream/parsing.py

@@ -102,6 +102,15 @@ class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
 
     #
 
+    def _next_tok(self):
+        while True:
+            tok = yield None
+
+            if tok.kind != 'SPACE':
+                return tok
+
+    #
+
     def _emit_event(self, v):
         if not self._stack:
             return ((v,), self._do_value())
@@ -129,7 +138,7 @@ class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
 
     def _do_value(self, *, must_be_present: bool = False):
         try:
-            tok = yield None
+            tok = yield from self._next_tok()
         except GeneratorExit:
             if self._stack:
                 raise JsonStreamParseError('Expected value') from None
@@ -180,7 +189,7 @@ class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
 
     def _do_object_body(self, *, must_be_present: bool = False):
         try:
-            tok = yield None
+            tok = yield from self._next_tok()
         except GeneratorExit:
             raise JsonStreamParseError('Expected object body') from None
 
@@ -188,7 +197,7 @@ class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
             k = tok.value
 
             try:
-                tok = yield None
+                tok = yield from self._next_tok()
             except GeneratorExit:
                 raise JsonStreamParseError('Expected key') from None
             if tok.kind != 'COLON':
@@ -211,7 +220,7 @@ class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
 
     def _do_after_pair(self):
         try:
-            tok = yield None
+            tok = yield from self._next_tok()
         except GeneratorExit:
             raise JsonStreamParseError('Expected continuation') from None
 
@@ -244,7 +253,7 @@ class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
 
     def _do_after_element(self):
         try:
-            tok = yield None
+            tok = yield from self._next_tok()
         except GeneratorExit:
             raise JsonStreamParseError('Expected continuation') from None
 

{omlish-0.0.0.dev307 → omlish-0.0.0.dev309}/omlish/lang/__init__.py

@@ -184,12 +184,11 @@ from .functions import (  # noqa
 )
 
 from .generators import (  # noqa
-    CoroutineGenerator,
-    Generator,
     GeneratorLike,
     GeneratorMappedIterator,
     autostart,
-    corogen,
+    capture_coroutine,
+    capture_generator,
     genmap,
     nextgen,
 )

{omlish-0.0.0.dev307 → omlish-0.0.0.dev309}/omlish/lang/generators.py

@@ -2,6 +2,7 @@ import abc
 import functools
 import typing as ta
 
+from .classes.restrict import Abstract
 from .maybes import Maybe
 from .maybes import empty
 from .maybes import just
@@ -79,15 +80,29 @@ def adapt_generator_like(gl):
 ##
 
 
-class Generator(ta.Generator[O, I, R]):
+class AbstractGeneratorCapture(Abstract, ta.Generic[O, I, R]):
     def __init__(self, g: ta.Generator[O, I, R]) -> None:
         super().__init__()
+
         self._g = g
 
     @property
     def g(self) -> ta.Generator[O, I, R]:
         return self._g
 
+    #
+
+    def close(self) -> None:
+        self._g.close()
+
+    def __enter__(self) -> ta.Self:
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self._g.close()
+
+
+class GeneratorCapture(AbstractGeneratorCapture[O, I, R], ta.Generator[O, I, R]):
     value: R
 
     def __iter__(self):
@@ -114,35 +129,11 @@ class Generator(ta.Generator[O, I, R]):
             self.value = e.value
             raise
 
-    def close(self):
-        self._g.close()
 
+capture_generator = GeneratorCapture
 
-##
-
-
-class CoroutineGenerator(ta.Generic[O, I, R]):
-    def __init__(self, g: ta.Generator[O, I, R]) -> None:
-        super().__init__()
-        self._g = g
-
-    @property
-    def g(self) -> ta.Generator[O, I, R]:
-        return self._g
-
-    #
-
-    def close(self) -> None:
-        self._g.close()
-
-    def __enter__(self) -> ta.Self:
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self._g.close()
-
-    #
 
+class CoroutineGeneratorCapture(AbstractGeneratorCapture[O, I, R]):
     class Output(ta.NamedTuple, ta.Generic[T]):
         v: T
 
@@ -192,7 +183,7 @@ class CoroutineGenerator(ta.Generic[O, I, R]):
             return self.Yield(o)
 
 
-corogen = CoroutineGenerator
+capture_coroutine = CoroutineGeneratorCapture
 
 
 ##

{omlish-0.0.0.dev307 → 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.dev307 → 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.dev307 → 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.dev307 → 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.dev307 → omlish-0.0.0.dev309}/omlish/specs/jsonrpc/__init__.py

@@ -16,6 +16,7 @@ from .types import (  # noqa
 
     NotSpecified,
     is_not_specified,
+    check_not_not_specified,
 
     Request,
     request,