omlish 0.0.0.dev447__py3-none-any.whl → 0.0.0.dev484__py3-none-any.whl

omlish/specs/jmespath/ast.py

@@ -1,7 +1,7 @@
 import abc
-import dataclasses as dc
 import typing as ta
 
+from ... import dataclasses as dc
 from ... import lang
 
 

omlish/specs/jsonrpc/__init__.py

@@ -36,6 +36,19 @@ from .types import (  # noqa
 ##
 
 
+from ... import lang as _lang
+
+
+with _lang.auto_proxy_init(globals()):
+    from .conns import (  # noqa
+        JsonrpcConnection as Connection,
+    )
+
+
+##
+
+
 from ... import marshal as _msh
 
+
 _msh.register_global_module_import('._marshal', __package__)

omlish/specs/jsonrpc/_marshal.py

@@ -5,7 +5,6 @@ from ... import dataclasses as dc
 from ... import lang
 from ... import marshal as msh
 from ... import reflect as rfl
-from ...funcs import match as mfs
 from .types import NotSpecified
 
 
@@ -25,33 +24,43 @@ class NotSpecifiedUnionMarshaler(msh.Marshaler):
         return self.m.marshal(ctx, o)
 
 
-class NotSpecifiedUnionMarshalerFactory(msh.MarshalerFactoryMatchClass):
-    @mfs.simple(lambda _, ctx, rty: (
-        isinstance(rty, rfl.Union) and
-        not rty.is_optional and
-        _NOT_SPECIFIED_RTY in rty.args
-    ))
-    def _build(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
-        args = set(check.isinstance(rty, rfl.Union).args) - {_NOT_SPECIFIED_RTY}
-        nty = rfl.type_(ta.Union[*args])
-        m = ctx.make(nty)
-        return NotSpecifiedUnionMarshaler(m)
+class NotSpecifiedUnionMarshalerFactory(msh.MarshalerFactory):
+    def make_marshaler(self, ctx: msh.MarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Marshaler] | None:
+        if not (
+            isinstance(rty, rfl.Union) and
+            not rty.is_optional and
+            _NOT_SPECIFIED_RTY in rty.args
+        ):
+            return None
 
+        def inner() -> msh.Marshaler:
+            args = set(check.isinstance(rty, rfl.Union).args) - {_NOT_SPECIFIED_RTY}
+            nty = rfl.type_(ta.Union[*args])
+            m = ctx.make_marshaler(nty)
+            return NotSpecifiedUnionMarshaler(m)
 
-class NotSpecifiedUnionUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
-    @mfs.simple(lambda _, ctx, rty: (
-        isinstance(rty, rfl.Union) and
-        not rty.is_optional and
-        _NOT_SPECIFIED_RTY in rty.args
-    ))
-    def _build(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
-        args = set(check.isinstance(rty, rfl.Union).args) - {_NOT_SPECIFIED_RTY}
-        nty = rfl.type_(ta.Union[*args])
-        return ctx.make(nty)
+        return inner
+
+
+class NotSpecifiedUnionUnmarshalerFactory(msh.UnmarshalerFactory):
+    def make_unmarshaler(self, ctx: msh.UnmarshalFactoryContext, rty: rfl.Type) -> ta.Callable[[], msh.Unmarshaler] | None:  # noqa
+        if not (
+            isinstance(rty, rfl.Union) and
+            not rty.is_optional and
+            _NOT_SPECIFIED_RTY in rty.args
+        ):
+            return None
+
+        def inner() -> msh.Unmarshaler:
+            args = set(check.isinstance(rty, rfl.Union).args) - {_NOT_SPECIFIED_RTY}
+            nty = rfl.type_(ta.Union[*args])
+            return ctx.make_unmarshaler(nty)
+
+        return inner
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         msh.ForbiddenTypeMarshalerFactory({_NOT_SPECIFIED_RTY}),
         msh.ForbiddenTypeUnmarshalerFactory({_NOT_SPECIFIED_RTY}),

omlish/specs/jsonrpc/conns.py

@@ -26,11 +26,6 @@ from .types import request
 ##
 
 
-@lang.cached_function
-def _create_id() -> str:
-    return str(uuid.uuid4())
-
-
 class JsonrpcConnection:
     def __init__(
             self,
@@ -40,6 +35,7 @@ class JsonrpcConnection:
             request_handler: ta.Callable[['JsonrpcConnection', Request], ta.Awaitable[None]] | None = None,
             notification_handler: ta.Callable[['JsonrpcConnection', Request], ta.Awaitable[None]] | None = None,
             default_timeout: float | None = 30.,
+            id_creator: ta.Callable[[], Id] | None = None,
     ) -> None:
         super().__init__()
 
@@ -48,6 +44,9 @@ class JsonrpcConnection:
         self._request_handler = request_handler
         self._notification_handler = notification_handler
         self._default_timeout = default_timeout
+        if id_creator is None:
+            id_creator = self.default_create_id
+        self._create_id = id_creator
 
         self._buf = DelimitingBuffer(b'\n')
         self._response_futures_by_id: dict[Id, aiu.Future[Response]] = {}
@@ -55,6 +54,10 @@ class JsonrpcConnection:
         self._shutdown_event = anyio.Event()
         self._received_eof = False
 
+    @classmethod
+    def default_create_id(cls) -> Id:
+        return str(uuid.uuid4())
+
     #
 
     class Error(Exception):
@@ -191,7 +194,7 @@ class JsonrpcConnection:
     async def send_message(self, msg: Message) -> None:
         async with self._send_lock:
             try:
-                await self._stream.send(json.dumps(msh.marshal(msg)).encode() + b'\n')
+                await self._stream.send(json.dumps(msh.marshal(msg)).encode() + b'\n')  # noqa
             except self.ERROR_EXCEPTIONS as e:
                 raise ConnectionError('Failed to send message') from e
 
@@ -204,7 +207,7 @@ class JsonrpcConnection:
             *,
             timeout: lang.TimeoutLike | None = lang.Timeout.DEFAULT,
     ) -> ta.Any:
-        msg_id = _create_id()
+        msg_id = self._create_id()
         req = request(msg_id, method, params)
 
         fut = aiu.create_future[Response]()

omlish/specs/jsonschema/_marshal.py

@@ -22,7 +22,7 @@ class _KeywordsUnmarshaler(msh.Unmarshaler):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         msh.TypeMapMarshalerFactory({Keywords: _KeywordsMarshaler()}),
         msh.TypeMapUnmarshalerFactory({Keywords: _KeywordsUnmarshaler()}),

omlish/specs/jsonschema/keywords/__init__.py

@@ -0,0 +1,7 @@
+from .... import dataclasses as _dc  # noqa
+
+
+_dc.init_package(
+    globals(),
+    codegen=True,
+)