omlish 0.0.0.dev134__tar.gz → 0.0.0.dev135__tar.gz

{omlish-0.0.0.dev134/omlish.egg-info → omlish-0.0.0.dev135}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev134
+Version: 0.0.0.dev135
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev134 → omlish-0.0.0.dev135}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev134'
-__revision__ = '2ce79daa2fabaed83f01745229d814bc8aeb7628'
+__version__ = '0.0.0.dev135'
+__revision__ = 'bf47c29e2fe6b065c99ce565d89f133b798895d9'
 
 
 #

{omlish-0.0.0.dev134 → omlish-0.0.0.dev135}/omlish/lite/fdio/corohttp.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 import socket
 import typing as ta
 
@@ -22,6 +23,7 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
             *,
             read_size: int = 0x10000,
             write_size: int = 0x10000,
+            log_handler: ta.Optional[ta.Callable[[CoroHttpServer, CoroHttpServer.AnyLogIo], None]] = None,
     ) -> None:
         check_state(not sock.getblocking())
 
@@ -30,6 +32,7 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
         self._handler = handler
         self._read_size = read_size
         self._write_size = write_size
+        self._log_handler = log_handler
 
         self._read_buf = ReadableListBuffer()
         self._write_buf: IncrementalWriteBuffer | None = None
@@ -64,7 +67,8 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
                     break
 
             if isinstance(o, CoroHttpServer.AnyLogIo):
-                print(o)
+                if self._log_handler is not None:
+                    self._log_handler(self._coro_srv, o)
                 o = None
 
             elif isinstance(o, CoroHttpServer.ReadIo):

{omlish-0.0.0.dev134 → omlish-0.0.0.dev135}/omlish/lite/marshal.py

@@ -165,6 +165,13 @@ class PolymorphicObjMarshaler(ObjMarshaler):
     impls_by_ty: ta.Mapping[type, Impl]
     impls_by_tag: ta.Mapping[str, Impl]
 
+    @classmethod
+    def of(cls, impls: ta.Iterable[Impl]) -> 'PolymorphicObjMarshaler':
+        return cls(
+            {i.ty: i for i in impls},
+            {i.tag: i for i in impls},
+        )
+
     def marshal(self, o: ta.Any) -> ta.Any:
         impl = self.impls_by_ty[type(o)]
         return {impl.tag: impl.m.marshal(o)}
@@ -252,7 +259,7 @@ def _make_obj_marshaler(
 ) -> ObjMarshaler:
     if isinstance(ty, type):
         if abc.ABC in ty.__bases__:
-            impls = [  # type: ignore
+            return PolymorphicObjMarshaler.of([  # type: ignore
                 PolymorphicObjMarshaler.Impl(
                     ity,
                     ity.__qualname__,
@@ -260,11 +267,7 @@ def _make_obj_marshaler(
                 )
                 for ity in deep_subclasses(ty)
                 if abc.ABC not in ity.__bases__
-            ]
-            return PolymorphicObjMarshaler(
-                {i.ty: i for i in impls},
-                {i.tag: i for i in impls},
-            )
+            ])
 
         if issubclass(ty, enum.Enum):
             return EnumObjMarshaler(ty)

{omlish-0.0.0.dev134 → omlish-0.0.0.dev135/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev134
+Version: 0.0.0.dev135
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev134 → omlish-0.0.0.dev135}/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.dev134'
+version = '0.0.0.dev135'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',