ominfra 0.0.0.dev144__py3-none-any.whl → 0.0.0.dev145__py3-none-any.whl

ominfra/scripts/supervisor.py

@@ -1565,7 +1565,7 @@ def check_non_empty(v: SizedT) -> SizedT:
 ##
 
 
-class FdIoPoller(abc.ABC):
+class FdioPoller(abc.ABC):
     def __init__(self) -> None:
         super().__init__()
 
@@ -1676,8 +1676,8 @@ class FdIoPoller(abc.ABC):
 ##
 
 
-class SelectFdIoPoller(FdIoPoller):
-    def poll(self, timeout: ta.Optional[float]) -> FdIoPoller.PollResult:
+class SelectFdioPoller(FdioPoller):
+    def poll(self, timeout: ta.Optional[float]) -> FdioPoller.PollResult:
         try:
             r, w, x = select.select(
                 self._readable,
@@ -1688,22 +1688,22 @@ class SelectFdIoPoller(FdIoPoller):
 
         except OSError as exc:
             if exc.errno == errno.EINTR:
-                return FdIoPoller.PollResult(msg='EINTR encountered in poll', exc=exc)
+                return FdioPoller.PollResult(msg='EINTR encountered in poll', exc=exc)
             elif exc.errno == errno.EBADF:
-                return FdIoPoller.PollResult(msg='EBADF encountered in poll', exc=exc)
+                return FdioPoller.PollResult(msg='EBADF encountered in poll', exc=exc)
             else:
                 raise
 
-        return FdIoPoller.PollResult(r, w)
+        return FdioPoller.PollResult(r, w)
 
 
 ##
 
 
-PollFdIoPoller: ta.Optional[ta.Type[FdIoPoller]]
+PollFdioPoller: ta.Optional[ta.Type[FdioPoller]]
 if hasattr(select, 'poll'):
 
-    class _PollFdIoPoller(FdIoPoller):
+    class _PollFdioPoller(FdioPoller):
         def __init__(self) -> None:
             super().__init__()
 
@@ -1736,14 +1736,14 @@ if hasattr(select, 'poll'):
 
         #
 
-        def poll(self, timeout: ta.Optional[float]) -> FdIoPoller.PollResult:
+        def poll(self, timeout: ta.Optional[float]) -> FdioPoller.PollResult:
             polled: ta.List[ta.Tuple[int, int]]
             try:
                 polled = self._poller.poll(timeout * 1000 if timeout is not None else None)
 
             except OSError as exc:
                 if exc.errno == errno.EINTR:
-                    return FdIoPoller.PollResult(msg='EINTR encountered in poll', exc=exc)
+                    return FdioPoller.PollResult(msg='EINTR encountered in poll', exc=exc)
                 else:
                     raise
 
@@ -1761,11 +1761,11 @@ if hasattr(select, 'poll'):
                     r.append(fd)
                 if mask & self._WRITE:
                     w.append(fd)
-            return FdIoPoller.PollResult(r, w, inv=inv)
+            return FdioPoller.PollResult(r, w, inv=inv)
 
-    PollFdIoPoller = _PollFdIoPoller
+    PollFdioPoller = _PollFdioPoller
 else:
-    PollFdIoPoller = None
+    PollFdioPoller = None
 
 
 ########################################
@@ -2600,7 +2600,7 @@ def attr_setting(obj, attr, val, *, default=None):  # noqa
 # ../../../omlish/lite/fdio/handlers.py
 
 
-class FdIoHandler(abc.ABC):
+class FdioHandler(abc.ABC):
     @abc.abstractmethod
     def fd(self) -> int:
         raise NotImplementedError
@@ -2636,7 +2636,7 @@ class FdIoHandler(abc.ABC):
         pass
 
 
-class SocketFdIoHandler(FdIoHandler, abc.ABC):
+class SocketFdioHandler(FdioHandler, abc.ABC):
     def __init__(
             self,
             addr: SocketAddress,
@@ -2664,10 +2664,10 @@ class SocketFdIoHandler(FdIoHandler, abc.ABC):
 # ../../../omlish/lite/fdio/kqueue.py
 
 
-KqueueFdIoPoller: ta.Optional[ta.Type[FdIoPoller]]
+KqueueFdioPoller: ta.Optional[ta.Type[FdioPoller]]
 if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
 
-    class _KqueueFdIoPoller(FdIoPoller):
+    class _KqueueFdioPoller(FdioPoller):
         DEFAULT_MAX_EVENTS = 1000
 
         def __init__(
@@ -2755,14 +2755,14 @@ if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
 
         #
 
-        def poll(self, timeout: ta.Optional[float]) -> FdIoPoller.PollResult:
+        def poll(self, timeout: ta.Optional[float]) -> FdioPoller.PollResult:
             kq = self._get_kqueue()
             try:
                 kes = kq.control(None, self._max_events, timeout)
 
             except OSError as exc:
                 if exc.errno == errno.EINTR:
-                    return FdIoPoller.PollResult(msg='EINTR encountered in poll', exc=exc)
+                    return FdioPoller.PollResult(msg='EINTR encountered in poll', exc=exc)
                 else:
                     raise
 
@@ -2774,11 +2774,11 @@ if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
                 if ke.filter == select.KQ_FILTER_WRITE:
                     w.append(ke.ident)
 
-            return FdIoPoller.PollResult(r, w)
+            return FdioPoller.PollResult(r, w)
 
-    KqueueFdIoPoller = _KqueueFdIoPoller
+    KqueueFdioPoller = _KqueueFdioPoller
 else:
-    KqueueFdIoPoller = None
+    KqueueFdioPoller = None
 
 
 ########################################
@@ -4738,23 +4738,24 @@ TODO:
 @dc.dataclass(frozen=True)
 class ObjMarshalOptions:
     raw_bytes: bool = False
+    nonstrict_dataclasses: bool = False
 
 
 class ObjMarshaler(abc.ABC):
     @abc.abstractmethod
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         raise NotImplementedError
 
 
 class NopObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
 
@@ -4762,29 +4763,29 @@ class NopObjMarshaler(ObjMarshaler):
 class ProxyObjMarshaler(ObjMarshaler):
     m: ta.Optional[ObjMarshaler] = None
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return check_not_none(self.m).marshal(o, opts)
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return check_not_none(self.m).marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return check_not_none(self.m).unmarshal(o, opts)
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return check_not_none(self.m).unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
 class CastObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty(o)
 
 
 class DynamicObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return marshal_obj(o)
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return ctx.manager.marshal_obj(o, opts=ctx.options)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
 
@@ -4792,10 +4793,10 @@ class DynamicObjMarshaler(ObjMarshaler):
 class Base64ObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return base64.b64encode(o).decode('ascii')
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty(base64.b64decode(o))
 
 
@@ -4803,25 +4804,25 @@ class Base64ObjMarshaler(ObjMarshaler):
 class BytesSwitchedObjMarshaler(ObjMarshaler):
     m: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        if opts.raw_bytes:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if ctx.options.raw_bytes:
             return o
-        return self.m.marshal(o, opts)
+        return self.m.marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        if opts.raw_bytes:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if ctx.options.raw_bytes:
             return o
-        return self.m.unmarshal(o, opts)
+        return self.m.unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
 class EnumObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o.name
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty.__members__[o]  # type: ignore
 
 
@@ -4829,15 +4830,15 @@ class EnumObjMarshaler(ObjMarshaler):
 class OptionalObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         if o is None:
             return None
-        return self.item.marshal(o, opts)
+        return self.item.marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         if o is None:
             return None
-        return self.item.unmarshal(o, opts)
+        return self.item.unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
@@ -4846,11 +4847,11 @@ class MappingObjMarshaler(ObjMarshaler):
     km: ObjMarshaler
     vm: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return {self.km.marshal(k, opts): self.vm.marshal(v, opts) for k, v in o.items()}
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return {self.km.marshal(k, ctx): self.vm.marshal(v, ctx) for k, v in o.items()}
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty((self.km.unmarshal(k, opts), self.vm.unmarshal(v, opts)) for k, v in o.items())
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty((self.km.unmarshal(k, ctx), self.vm.unmarshal(v, ctx)) for k, v in o.items())
 
 
 @dc.dataclass(frozen=True)
@@ -4858,11 +4859,11 @@ class IterableObjMarshaler(ObjMarshaler):
     ty: type
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return [self.item.marshal(e, opts) for e in o]
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return [self.item.marshal(e, ctx) for e in o]
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty(self.item.unmarshal(e, opts) for e in o)
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(self.item.unmarshal(e, ctx) for e in o)
 
 
 @dc.dataclass(frozen=True)
@@ -4871,11 +4872,18 @@ class DataclassObjMarshaler(ObjMarshaler):
     fs: ta.Mapping[str, ObjMarshaler]
     nonstrict: bool = False
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return {k: m.marshal(getattr(o, k), opts) for k, m in self.fs.items()}
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return {
+            k: m.marshal(getattr(o, k), ctx)
+            for k, m in self.fs.items()
+        }
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v, opts) for k, v in o.items() if not self.nonstrict or k in self.fs})
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(**{
+            k: self.fs[k].unmarshal(v, ctx)
+            for k, v in o.items()
+            if not (self.nonstrict or ctx.options.nonstrict_dataclasses) or k in self.fs
+        })
 
 
 @dc.dataclass(frozen=True)
@@ -4895,50 +4903,50 @@ class PolymorphicObjMarshaler(ObjMarshaler):
             {i.tag: i for i in impls},
         )
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         impl = self.impls_by_ty[type(o)]
-        return {impl.tag: impl.m.marshal(o, opts)}
+        return {impl.tag: impl.m.marshal(o, ctx)}
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         [(t, v)] = o.items()
         impl = self.impls_by_tag[t]
-        return impl.m.unmarshal(v, opts)
+        return impl.m.unmarshal(v, ctx)
 
 
 @dc.dataclass(frozen=True)
 class DatetimeObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o.isoformat()
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty.fromisoformat(o)  # type: ignore
 
 
 class DecimalObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return str(check_isinstance(o, decimal.Decimal))
 
-    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, v: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return decimal.Decimal(check_isinstance(v, str))
 
 
 class FractionObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         fr = check_isinstance(o, fractions.Fraction)
         return [fr.numerator, fr.denominator]
 
-    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, v: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         num, denom = check_isinstance(v, list)
         return fractions.Fraction(num, denom)
 
 
 class UuidObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return str(o)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return uuid.UUID(o)
 
 
@@ -5099,6 +5107,12 @@ class ObjMarshalerManager:
 
     #
 
+    def _make_context(self, opts: ta.Optional[ObjMarshalOptions]) -> 'ObjMarshalContext':
+        return ObjMarshalContext(
+            options=opts or self._default_options,
+            manager=self,
+        )
+
     def marshal_obj(
             self,
             o: ta.Any,
@@ -5106,7 +5120,7 @@ class ObjMarshalerManager:
             opts: ta.Optional[ObjMarshalOptions] = None,
     ) -> ta.Any:
         m = self.get_obj_marshaler(ty if ty is not None else type(o))
-        return m.marshal(o, opts or self._default_options)
+        return m.marshal(o, self._make_context(opts))
 
     def unmarshal_obj(
             self,
@@ -5115,7 +5129,7 @@ class ObjMarshalerManager:
             opts: ta.Optional[ObjMarshalOptions] = None,
     ) -> T:
         m = self.get_obj_marshaler(ty)
-        return m.unmarshal(o, opts or self._default_options)
+        return m.unmarshal(o, self._make_context(opts))
 
     def roundtrip_obj(
             self,
@@ -5130,6 +5144,12 @@ class ObjMarshalerManager:
         return u
 
 
+@dc.dataclass(frozen=True)
+class ObjMarshalContext:
+    options: ObjMarshalOptions
+    manager: ObjMarshalerManager
+
+
 ##
 
 
@@ -6125,7 +6145,7 @@ class HasDispatchers(abc.ABC):
         raise NotImplementedError
 
 
-class ProcessDispatcher(FdIoHandler, abc.ABC):
+class ProcessDispatcher(FdioHandler, abc.ABC):
     @property
     @abc.abstractmethod
     def channel(self) -> ProcessOutputChannel:
@@ -6255,7 +6275,7 @@ class ProcessGroup(
 # ../../../omlish/lite/fdio/corohttp.py
 
 
-class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
+class CoroHttpServerConnectionFdioHandler(SocketFdioHandler):
     def __init__(
             self,
             addr: SocketAddress,
@@ -6384,8 +6404,8 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
 # ../dispatchers.py
 
 
-class Dispatchers(KeyedCollection[Fd, FdIoHandler]):
-    def _key(self, v: FdIoHandler) -> Fd:
+class Dispatchers(KeyedCollection[Fd, FdioHandler]):
+    def _key(self, v: FdioHandler) -> Fd:
         return Fd(v.fd())
 
     #
@@ -7180,7 +7200,7 @@ class IoManager(HasDispatchers):
     def __init__(
             self,
             *,
-            poller: FdIoPoller,
+            poller: FdioPoller,
             has_dispatchers_list: HasDispatchersList,
     ) -> None:
         super().__init__()
@@ -7292,7 +7312,7 @@ class ProcessSpawning:
 ##
 
 
-class SocketServerFdIoHandler(SocketFdIoHandler):
+class SocketServerFdioHandler(SocketFdioHandler):
     def __init__(
             self,
             addr: SocketAddress,
@@ -7339,9 +7359,9 @@ class HttpServer(HasDispatchers):
         self._handler = handler.h
         self._addr = addr.a
 
-        self._server = SocketServerFdIoHandler(self._addr, self._on_connect)
+        self._server = SocketServerFdioHandler(self._addr, self._on_connect)
 
-        self._conns: ta.List[CoroHttpServerConnectionFdIoHandler] = []
+        self._conns: ta.List[CoroHttpServerConnectionFdioHandler] = []
 
         exit_stack.enter_context(defer(self._server.close))  # noqa
 
@@ -7357,7 +7377,7 @@ class HttpServer(HasDispatchers):
         ])
 
     def _on_connect(self, sock: socket.socket, addr: SocketAddress) -> None:
-        conn = CoroHttpServerConnectionFdIoHandler(
+        conn = CoroHttpServerConnectionFdioHandler(
             addr,
             sock,
             self._handler,
@@ -8106,7 +8126,7 @@ class ProcessSpawningImpl(ProcessSpawning):
         return exe, args
 
     def _make_dispatchers(self, pipes: ProcessPipes) -> Dispatchers:
-        dispatchers: ta.List[FdIoHandler] = []
+        dispatchers: ta.List[FdioHandler] = []
 
         if pipes.stdout is not None:
             dispatchers.append(check_isinstance(self._output_dispatcher_factory(
@@ -8296,7 +8316,7 @@ class Supervisor:
             self,
             *,
             config: ServerConfig,
-            poller: FdIoPoller,
+            poller: FdioPoller,
             process_groups: ProcessGroupManager,
             signal_handler: SignalHandler,
             event_callbacks: EventCallbacks,
@@ -8536,8 +8556,8 @@ def waitpid() -> ta.Optional[WaitedPid]:
 
 
 @dc.dataclass(frozen=True)
-class _FdIoPollerDaemonizeListener(DaemonizeListener):
-    _poller: FdIoPoller
+class _FdioPollerDaemonizeListener(DaemonizeListener):
+    _poller: FdioPoller
 
     def before_daemonize(self) -> None:
         self._poller.close()
@@ -8609,14 +8629,14 @@ def bind_server(
     #
 
     poller_impl = next(filter(None, [
-        KqueueFdIoPoller,
-        PollFdIoPoller,
-        SelectFdIoPoller,
+        KqueueFdioPoller,
+        PollFdioPoller,
+        SelectFdioPoller,
     ]))
     lst.extend([
-        inj.bind(poller_impl, key=FdIoPoller, singleton=True),
-        inj.bind(_FdIoPollerDaemonizeListener, singleton=True),
-        inj.bind(DaemonizeListener, array=True, to_key=_FdIoPollerDaemonizeListener),
+        inj.bind(poller_impl, key=FdioPoller, singleton=True),
+        inj.bind(_FdioPollerDaemonizeListener, singleton=True),
+        inj.bind(DaemonizeListener, array=True, to_key=_FdioPollerDaemonizeListener),
     ])
 
     #

ominfra/supervisor/dispatchers.py

@@ -1,13 +1,13 @@
 # ruff: noqa: UP006 UP007
-from omlish.lite.fdio.handlers import FdIoHandler
+from omlish.lite.fdio.handlers import FdioHandler
 
 from .types import ProcessOutputDispatcher
 from .utils.collections import KeyedCollection
 from .utils.ostypes import Fd
 
 
-class Dispatchers(KeyedCollection[Fd, FdIoHandler]):
-    def _key(self, v: FdIoHandler) -> Fd:
+class Dispatchers(KeyedCollection[Fd, FdioHandler]):
+    def _key(self, v: FdioHandler) -> Fd:
         return Fd(v.fd())
 
     #

ominfra/supervisor/http.py

@@ -6,8 +6,8 @@ import typing as ta
 
 from omlish.lite.check import check_not_none
 from omlish.lite.contextmanagers import defer
-from omlish.lite.fdio.corohttp import CoroHttpServerConnectionFdIoHandler
-from omlish.lite.fdio.handlers import SocketFdIoHandler
+from omlish.lite.fdio.corohttp import CoroHttpServerConnectionFdioHandler
+from omlish.lite.fdio.handlers import SocketFdioHandler
 from omlish.lite.http.handlers import HttpHandler
 from omlish.lite.http.handlers import HttpHandlerRequest
 from omlish.lite.http.handlers import HttpHandlerResponse
@@ -22,7 +22,7 @@ from .types import HasDispatchers
 ##
 
 
-class SocketServerFdIoHandler(SocketFdIoHandler):
+class SocketServerFdioHandler(SocketFdioHandler):
     def __init__(
             self,
             addr: SocketAddress,
@@ -69,9 +69,9 @@ class HttpServer(HasDispatchers):
         self._handler = handler.h
         self._addr = addr.a
 
-        self._server = SocketServerFdIoHandler(self._addr, self._on_connect)
+        self._server = SocketServerFdioHandler(self._addr, self._on_connect)
 
-        self._conns: ta.List[CoroHttpServerConnectionFdIoHandler] = []
+        self._conns: ta.List[CoroHttpServerConnectionFdioHandler] = []
 
         exit_stack.enter_context(defer(self._server.close))  # noqa
 
@@ -87,7 +87,7 @@ class HttpServer(HasDispatchers):
         ])
 
     def _on_connect(self, sock: socket.socket, addr: SocketAddress) -> None:
-        conn = CoroHttpServerConnectionFdIoHandler(
+        conn = CoroHttpServerConnectionFdioHandler(
             addr,
             sock,
             self._handler,

ominfra/supervisor/inject.py

@@ -3,10 +3,10 @@ import contextlib
 import dataclasses as dc
 import typing as ta
 
-from omlish.lite.fdio.kqueue import KqueueFdIoPoller  # noqa
-from omlish.lite.fdio.pollers import FdIoPoller
-from omlish.lite.fdio.pollers import PollFdIoPoller  # noqa
-from omlish.lite.fdio.pollers import SelectFdIoPoller
+from omlish.lite.fdio.kqueue import KqueueFdioPoller  # noqa
+from omlish.lite.fdio.pollers import FdioPoller
+from omlish.lite.fdio.pollers import PollFdioPoller  # noqa
+from omlish.lite.fdio.pollers import SelectFdioPoller
 from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
@@ -46,8 +46,8 @@ from .utils.users import get_user
 
 
 @dc.dataclass(frozen=True)
-class _FdIoPollerDaemonizeListener(DaemonizeListener):
-    _poller: FdIoPoller
+class _FdioPollerDaemonizeListener(DaemonizeListener):
+    _poller: FdioPoller
 
     def before_daemonize(self) -> None:
         self._poller.close()
@@ -119,14 +119,14 @@ def bind_server(
     #
 
     poller_impl = next(filter(None, [
-        KqueueFdIoPoller,
-        PollFdIoPoller,
-        SelectFdIoPoller,
+        KqueueFdioPoller,
+        PollFdioPoller,
+        SelectFdioPoller,
     ]))
     lst.extend([
-        inj.bind(poller_impl, key=FdIoPoller, singleton=True),
-        inj.bind(_FdIoPollerDaemonizeListener, singleton=True),
-        inj.bind(DaemonizeListener, array=True, to_key=_FdIoPollerDaemonizeListener),
+        inj.bind(poller_impl, key=FdioPoller, singleton=True),
+        inj.bind(_FdioPollerDaemonizeListener, singleton=True),
+        inj.bind(DaemonizeListener, array=True, to_key=_FdioPollerDaemonizeListener),
     ])
 
     #

ominfra/supervisor/io.py

@@ -1,7 +1,7 @@
 # ruff: noqa: UP006 UP007
 import typing as ta
 
-from omlish.lite.fdio.pollers import FdIoPoller
+from omlish.lite.fdio.pollers import FdioPoller
 from omlish.lite.logs import log
 
 from .dispatchers import Dispatchers
@@ -20,7 +20,7 @@ class IoManager(HasDispatchers):
     def __init__(
             self,
             *,
-            poller: FdIoPoller,
+            poller: FdioPoller,
             has_dispatchers_list: HasDispatchersList,
     ) -> None:
         super().__init__()