ominfra 0.0.0.dev125__tar.gz → 0.0.0.dev126__tar.gz

{ominfra-0.0.0.dev125/ominfra.egg-info → ominfra-0.0.0.dev126}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev125
+Version: 0.0.0.dev126
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev125
-Requires-Dist: omlish==0.0.0.dev125
+Requires-Dist: omdev==0.0.0.dev126
+Requires-Dist: omlish==0.0.0.dev126
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra/scripts/supervisor.py

@@ -4898,16 +4898,43 @@ class ServerContext(abc.ABC):
         raise NotImplementedError
 
 
-# class Dispatcher(abc.ABC):
-#     pass
-#
-#
-# class OutputDispatcher(Dispatcher, abc.ABC):
-#     pass
-#
-#
-# class InputDispatcher(Dispatcher, abc.ABC):
-#     pass
+class Dispatcher(abc.ABC):
+    @abc.abstractmethod
+    def readable(self) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def writable(self) -> bool:
+        raise NotImplementedError
+
+    def handle_read_event(self) -> None:
+        raise TypeError
+
+    def handle_write_event(self) -> None:
+        raise TypeError
+
+    @abc.abstractmethod
+    def handle_error(self) -> None:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def closed(self) -> bool:
+        raise NotImplementedError
+
+
+class OutputDispatcher(Dispatcher, abc.ABC):
+    pass
+
+
+class InputDispatcher(Dispatcher, abc.ABC):
+    @abc.abstractmethod
+    def write(self, chars: ta.Union[bytes, str]) -> None:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def flush(self) -> None:
+        raise NotImplementedError
 
 
 @functools.total_ordering
@@ -4966,7 +4993,7 @@ class Process(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def get_dispatchers(self) -> ta.Mapping[int, ta.Any]:  # Dispatcher]:
+    def get_dispatchers(self) -> ta.Mapping[int, Dispatcher]:
         raise NotImplementedError
 
 
@@ -5001,7 +5028,7 @@ class ProcessGroup(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def get_dispatchers(self) -> ta.Mapping[int, ta.Any]:  # Dispatcher]:
+    def get_dispatchers(self) -> ta.Mapping[int, Dispatcher]:
         raise NotImplementedError
 
     @abc.abstractmethod
@@ -5415,7 +5442,7 @@ def check_execv_args(filename, argv, st) -> None:
 # ../dispatchers.py
 
 
-class Dispatcher(abc.ABC):
+class BaseDispatcherImpl(Dispatcher, abc.ABC):
     def __init__(
             self,
             process: Process,
@@ -5452,20 +5479,6 @@ class Dispatcher(abc.ABC):
     def closed(self) -> bool:
         return self._closed
 
-    @abc.abstractmethod
-    def readable(self) -> bool:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def writable(self) -> bool:
-        raise NotImplementedError
-
-    def handle_read_event(self) -> None:
-        raise TypeError
-
-    def handle_write_event(self) -> None:
-        raise TypeError
-
     def handle_error(self) -> None:
         nil, t, v, tbinfo = compact_traceback()
 
@@ -5477,11 +5490,8 @@ class Dispatcher(abc.ABC):
             log.debug('fd %s closed, stopped monitoring %s', self._fd, self)
             self._closed = True
 
-    def flush(self) -> None:  # noqa
-        pass
-
 
-class OutputDispatcher(Dispatcher):
+class OutputDispatcherImpl(BaseDispatcherImpl, OutputDispatcher):
     """
     Dispatcher for one channel (stdout or stderr) of one process. Serves several purposes:
 
@@ -5495,13 +5505,14 @@ class OutputDispatcher(Dispatcher):
             process: Process,
             event_type: ta.Type[ProcessCommunicationEvent],
             fd: int,
-            **kwargs: ta.Any,
+            *,
+            event_callbacks: EventCallbacks,
     ) -> None:
         super().__init__(
             process,
             event_type.channel,
             fd,
-            **kwargs,
+            event_callbacks=event_callbacks,
         )
 
         self._event_type = event_type
@@ -5698,19 +5709,20 @@ class OutputDispatcher(Dispatcher):
             self.close()
 
 
-class InputDispatcher(Dispatcher):
+class InputDispatcherImpl(BaseDispatcherImpl, InputDispatcher):
     def __init__(
             self,
             process: Process,
             channel: str,
             fd: int,
-            **kwargs: ta.Any,
+            *,
+            event_callbacks: EventCallbacks,
     ) -> None:
         super().__init__(
             process,
             channel,
             fd,
-            **kwargs,
+            event_callbacks=event_callbacks,
         )
 
         self._input_buffer = b''
@@ -5769,7 +5781,7 @@ class ProcessGroupImpl(ProcessGroup):
 
         self._processes = {}
         for pconfig in self._config.processes or []:
-            process = self._process_factory(pconfig, self)
+            process = check_isinstance(self._process_factory(pconfig, self), Process)
             self._processes[pconfig.name] = process
 
     @property
@@ -5893,6 +5905,12 @@ class ProcessGroups:
 # ../process.py
 
 
+# (process: Process, event_type: ta.Type[ProcessCommunicationEvent], fd: int)
+OutputDispatcherFactory = ta.NewType('OutputDispatcherFactory', Func[OutputDispatcher])
+
+# (process: Process, event_type: ta.Type[ProcessCommunicationEvent], fd: int)
+InputDispatcherFactory = ta.NewType('InputDispatcherFactory', Func[InputDispatcher])
+
 InheritedFds = ta.NewType('InheritedFds', ta.FrozenSet[int])
 
 
@@ -5910,14 +5928,23 @@ class ProcessImpl(Process):
             context: ServerContext,
             event_callbacks: EventCallbacks,
 
+            output_dispatcher_factory: OutputDispatcherFactory,
+            input_dispatcher_factory: InputDispatcherFactory,
+
             inherited_fds: ta.Optional[InheritedFds] = None,
+
     ) -> None:
         super().__init__()
 
         self._config = config
         self._group = group
+
         self._context = context
         self._event_callbacks = event_callbacks
+
+        self._output_dispatcher_factory = output_dispatcher_factory
+        self._input_dispatcher_factory = input_dispatcher_factory
+
         self._inherited_fds = InheritedFds(frozenset(inherited_fds or []))
 
         self._dispatchers: ta.Dict[int, Dispatcher] = {}
@@ -6161,29 +6188,29 @@ class ProcessImpl(Process):
         etype: ta.Type[ProcessCommunicationEvent]
         if stdout_fd is not None:
             etype = ProcessCommunicationStdoutEvent
-            dispatchers[stdout_fd] = OutputDispatcher(
+            dispatchers[stdout_fd] = check_isinstance(self._output_dispatcher_factory(
                 self,
                 etype,
                 stdout_fd,
                 **dispatcher_kw,
-            )
+            ), OutputDispatcher)
 
         if stderr_fd is not None:
             etype = ProcessCommunicationStderrEvent
-            dispatchers[stderr_fd] = OutputDispatcher(
+            dispatchers[stderr_fd] = check_isinstance(self._output_dispatcher_factory(
                 self,
                 etype,
                 stderr_fd,
                 **dispatcher_kw,
-            )
+            ), OutputDispatcher)
 
         if stdin_fd is not None:
-            dispatchers[stdin_fd] = InputDispatcher(
+            dispatchers[stdin_fd] = check_isinstance(self._input_dispatcher_factory(
                 self,
                 'stdin',
                 stdin_fd,
                 **dispatcher_kw,
-            )
+            ), InputDispatcher)
 
         return dispatchers, p
 
@@ -6715,7 +6742,7 @@ class Supervisor:
         if self._process_groups.get(config.name) is not None:
             return False
 
-        group = self._process_group_factory(config)
+        group = check_isinstance(self._process_group_factory(config), ProcessGroup)
         group.after_setuid()
 
         self._process_groups.add(group)
@@ -6981,6 +7008,9 @@ def bind_server(
 
         inj.bind_factory(ProcessGroupFactory, ProcessGroupImpl),
         inj.bind_factory(ProcessFactory, ProcessImpl),
+
+        inj.bind_factory(OutputDispatcherFactory, OutputDispatcherImpl),
+        inj.bind_factory(InputDispatcherFactory, InputDispatcherImpl),
     ]
 
     #

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra/supervisor/dispatchers.py

@@ -12,6 +12,9 @@ from .events import EventCallbacks
 from .events import ProcessCommunicationEvent
 from .events import ProcessLogStderrEvent
 from .events import ProcessLogStdoutEvent
+from .types import Dispatcher
+from .types import InputDispatcher
+from .types import OutputDispatcher
 from .types import Process
 from .utils import as_bytes
 from .utils import compact_traceback
@@ -20,7 +23,7 @@ from .utils import read_fd
 from .utils import strip_escapes
 
 
-class Dispatcher(abc.ABC):
+class BaseDispatcherImpl(Dispatcher, abc.ABC):
     def __init__(
             self,
             process: Process,
@@ -57,20 +60,6 @@ class Dispatcher(abc.ABC):
     def closed(self) -> bool:
         return self._closed
 
-    @abc.abstractmethod
-    def readable(self) -> bool:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def writable(self) -> bool:
-        raise NotImplementedError
-
-    def handle_read_event(self) -> None:
-        raise TypeError
-
-    def handle_write_event(self) -> None:
-        raise TypeError
-
     def handle_error(self) -> None:
         nil, t, v, tbinfo = compact_traceback()
 
@@ -82,11 +71,8 @@ class Dispatcher(abc.ABC):
             log.debug('fd %s closed, stopped monitoring %s', self._fd, self)
             self._closed = True
 
-    def flush(self) -> None:  # noqa
-        pass
-
 
-class OutputDispatcher(Dispatcher):
+class OutputDispatcherImpl(BaseDispatcherImpl, OutputDispatcher):
     """
     Dispatcher for one channel (stdout or stderr) of one process. Serves several purposes:
 
@@ -100,13 +86,14 @@ class OutputDispatcher(Dispatcher):
             process: Process,
             event_type: ta.Type[ProcessCommunicationEvent],
             fd: int,
-            **kwargs: ta.Any,
+            *,
+            event_callbacks: EventCallbacks,
     ) -> None:
         super().__init__(
             process,
             event_type.channel,
             fd,
-            **kwargs,
+            event_callbacks=event_callbacks,
         )
 
         self._event_type = event_type
@@ -303,19 +290,20 @@ class OutputDispatcher(Dispatcher):
             self.close()
 
 
-class InputDispatcher(Dispatcher):
+class InputDispatcherImpl(BaseDispatcherImpl, InputDispatcher):
     def __init__(
             self,
             process: Process,
             channel: str,
             fd: int,
-            **kwargs: ta.Any,
+            *,
+            event_callbacks: EventCallbacks,
     ) -> None:
         super().__init__(
             process,
             channel,
             fd,
-            **kwargs,
+            event_callbacks=event_callbacks,
         )
 
         self._input_buffer = b''

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra/supervisor/groups.py

@@ -1,14 +1,15 @@
 # ruff: noqa: UP006 UP007
 import typing as ta
 
+from omlish.lite.check import check_isinstance
 from omlish.lite.typing import Func
 
 from .configs import ProcessGroupConfig
-from .dispatchers import Dispatcher
 from .events import EventCallbacks
 from .events import ProcessGroupAddedEvent
 from .events import ProcessGroupRemovedEvent
 from .states import ProcessState
+from .types import Dispatcher
 from .types import Process
 from .types import ProcessGroup
 from .types import ServerContext
@@ -36,7 +37,7 @@ class ProcessGroupImpl(ProcessGroup):
 
         self._processes = {}
         for pconfig in self._config.processes or []:
-            process = self._process_factory(pconfig, self)
+            process = check_isinstance(self._process_factory(pconfig, self), Process)
             self._processes[pconfig.name] = process
 
     @property

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra/supervisor/inject.py

@@ -8,12 +8,16 @@ from omlish.lite.inject import inj
 from .configs import ServerConfig
 from .context import ServerContextImpl
 from .context import ServerEpoch
+from .dispatchers import InputDispatcherImpl
+from .dispatchers import OutputDispatcherImpl
 from .events import EventCallbacks
 from .groups import ProcessFactory
 from .groups import ProcessGroupImpl
 from .poller import Poller
 from .poller import get_poller_impl
 from .process import InheritedFds
+from .process import InputDispatcherFactory
+from .process import OutputDispatcherFactory
 from .process import ProcessImpl
 from .signals import SignalReceiver
 from .supervisor import ProcessGroupFactory
@@ -50,6 +54,9 @@ def bind_server(
 
         inj.bind_factory(ProcessGroupFactory, ProcessGroupImpl),
         inj.bind_factory(ProcessFactory, ProcessImpl),
+
+        inj.bind_factory(OutputDispatcherFactory, OutputDispatcherImpl),
+        inj.bind_factory(InputDispatcherFactory, InputDispatcherImpl),
     ]
 
     #

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra/supervisor/process.py

@@ -9,6 +9,7 @@ import typing as ta
 
 from omlish.lite.check import check_isinstance
 from omlish.lite.logs import log
+from omlish.lite.typing import Func
 
 from .configs import ProcessConfig
 from .context import check_execv_args
@@ -17,9 +18,6 @@ from .context import close_parent_pipes
 from .context import drop_privileges
 from .context import make_pipes
 from .datatypes import RestartUnconditionally
-from .dispatchers import Dispatcher
-from .dispatchers import InputDispatcher
-from .dispatchers import OutputDispatcher
 from .events import PROCESS_STATE_EVENT_MAP
 from .events import EventCallbacks
 from .events import ProcessCommunicationEvent
@@ -30,6 +28,9 @@ from .exceptions import ProcessError
 from .signals import sig_name
 from .states import ProcessState
 from .states import SupervisorState
+from .types import Dispatcher
+from .types import InputDispatcher
+from .types import OutputDispatcher
 from .types import Process
 from .types import ProcessGroup
 from .types import ServerContext
@@ -42,6 +43,12 @@ from .utils import get_path
 from .utils import real_exit
 
 
+# (process: Process, event_type: ta.Type[ProcessCommunicationEvent], fd: int)
+OutputDispatcherFactory = ta.NewType('OutputDispatcherFactory', Func[OutputDispatcher])
+
+# (process: Process, event_type: ta.Type[ProcessCommunicationEvent], fd: int)
+InputDispatcherFactory = ta.NewType('InputDispatcherFactory', Func[InputDispatcher])
+
 InheritedFds = ta.NewType('InheritedFds', ta.FrozenSet[int])
 
 
@@ -59,14 +66,23 @@ class ProcessImpl(Process):
             context: ServerContext,
             event_callbacks: EventCallbacks,
 
+            output_dispatcher_factory: OutputDispatcherFactory,
+            input_dispatcher_factory: InputDispatcherFactory,
+
             inherited_fds: ta.Optional[InheritedFds] = None,
+
     ) -> None:
         super().__init__()
 
         self._config = config
         self._group = group
+
         self._context = context
         self._event_callbacks = event_callbacks
+
+        self._output_dispatcher_factory = output_dispatcher_factory
+        self._input_dispatcher_factory = input_dispatcher_factory
+
         self._inherited_fds = InheritedFds(frozenset(inherited_fds or []))
 
         self._dispatchers: ta.Dict[int, Dispatcher] = {}
@@ -310,29 +326,29 @@ class ProcessImpl(Process):
         etype: ta.Type[ProcessCommunicationEvent]
         if stdout_fd is not None:
             etype = ProcessCommunicationStdoutEvent
-            dispatchers[stdout_fd] = OutputDispatcher(
+            dispatchers[stdout_fd] = check_isinstance(self._output_dispatcher_factory(
                 self,
                 etype,
                 stdout_fd,
                 **dispatcher_kw,
-            )
+            ), OutputDispatcher)
 
         if stderr_fd is not None:
             etype = ProcessCommunicationStderrEvent
-            dispatchers[stderr_fd] = OutputDispatcher(
+            dispatchers[stderr_fd] = check_isinstance(self._output_dispatcher_factory(
                 self,
                 etype,
                 stderr_fd,
                 **dispatcher_kw,
-            )
+            ), OutputDispatcher)
 
         if stdin_fd is not None:
-            dispatchers[stdin_fd] = InputDispatcher(
+            dispatchers[stdin_fd] = check_isinstance(self._input_dispatcher_factory(
                 self,
                 'stdin',
                 stdin_fd,
                 **dispatcher_kw,
-            )
+            ), InputDispatcher)
 
         return dispatchers, p
 

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra/supervisor/supervisor.py

@@ -4,13 +4,13 @@ import time
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check_isinstance
 from omlish.lite.check import check_not_none
 from omlish.lite.logs import log
 from omlish.lite.typing import Func
 
 from .configs import ProcessGroupConfig
 from .context import ServerContextImpl
-from .dispatchers import Dispatcher
 from .events import TICK_EVENTS
 from .events import EventCallbacks
 from .events import SupervisorRunningEvent
@@ -21,6 +21,7 @@ from .poller import Poller
 from .signals import SignalReceiver
 from .signals import sig_name
 from .states import SupervisorState
+from .types import Dispatcher
 from .types import Process
 from .utils import ExitNow
 from .utils import as_string
@@ -149,7 +150,7 @@ class Supervisor:
         if self._process_groups.get(config.name) is not None:
             return False
 
-        group = self._process_group_factory(config)
+        group = check_isinstance(self._process_group_factory(config), ProcessGroup)
         group.after_setuid()
 
         self._process_groups.add(group)

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra/supervisor/types.py

@@ -31,16 +31,43 @@ class ServerContext(abc.ABC):
         raise NotImplementedError
 
 
-# class Dispatcher(abc.ABC):
-#     pass
-#
-#
-# class OutputDispatcher(Dispatcher, abc.ABC):
-#     pass
-#
-#
-# class InputDispatcher(Dispatcher, abc.ABC):
-#     pass
+class Dispatcher(abc.ABC):
+    @abc.abstractmethod
+    def readable(self) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def writable(self) -> bool:
+        raise NotImplementedError
+
+    def handle_read_event(self) -> None:
+        raise TypeError
+
+    def handle_write_event(self) -> None:
+        raise TypeError
+
+    @abc.abstractmethod
+    def handle_error(self) -> None:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def closed(self) -> bool:
+        raise NotImplementedError
+
+
+class OutputDispatcher(Dispatcher, abc.ABC):
+    pass
+
+
+class InputDispatcher(Dispatcher, abc.ABC):
+    @abc.abstractmethod
+    def write(self, chars: ta.Union[bytes, str]) -> None:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def flush(self) -> None:
+        raise NotImplementedError
 
 
 @functools.total_ordering
@@ -99,7 +126,7 @@ class Process(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def get_dispatchers(self) -> ta.Mapping[int, ta.Any]:  # Dispatcher]:
+    def get_dispatchers(self) -> ta.Mapping[int, Dispatcher]:
         raise NotImplementedError
 
 
@@ -134,7 +161,7 @@ class ProcessGroup(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def get_dispatchers(self) -> ta.Mapping[int, ta.Any]:  # Dispatcher]:
+    def get_dispatchers(self) -> ta.Mapping[int, Dispatcher]:
         raise NotImplementedError
 
     @abc.abstractmethod

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev125
+Version: 0.0.0.dev126
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev125
-Requires-Dist: omlish==0.0.0.dev125
+Requires-Dist: omdev==0.0.0.dev126
+Requires-Dist: omlish==0.0.0.dev126
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev125
-omlish==0.0.0.dev125
+omdev==0.0.0.dev126
+omlish==0.0.0.dev126
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev125 → ominfra-0.0.0.dev126}/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.dev125'
+version = '0.0.0.dev126'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev125',
-    'omlish == 0.0.0.dev125',
+    'omdev == 0.0.0.dev126',
+    'omlish == 0.0.0.dev126',
 ]
 
 [project.optional-dependencies]