ominfra 0.0.0.dev123__py3-none-any.whl → 0.0.0.dev124__py3-none-any.whl

ominfra/supervisor/LICENSE.txt

@@ -0,0 +1,28 @@
+Supervisor is licensed under the following license:
+
+  A copyright notice accompanies this license document that identifies the copyright holders.
+
+  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+  following conditions are met:
+
+  1.  Redistributions in source code must retain the accompanying copyright notice, this list of conditions, and the
+      following disclaimer.
+
+  2.  Redistributions in binary form must reproduce the accompanying copyright notice, this list of conditions, and the
+      following disclaimer in the documentation and/or other materials provided with the distribution.
+
+  3.  Names of the copyright holders must not be used to endorse or promote products derived from this software without
+      prior written permission from the copyright holders.
+
+  4.  If any files are modified, you must cause the modified files to carry prominent notices stating that you changed
+      the files and the date of any change.
+
+  Disclaimer
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+    NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+    EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ominfra/supervisor/inject.py

@@ -0,0 +1,81 @@
+# ruff: noqa: UP006 UP007
+import functools
+import typing as ta
+
+from omlish.lite.inject import Injector
+from omlish.lite.inject import InjectorBindingOrBindings
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
+
+from .configs import ProcessConfig
+from .configs import ProcessGroupConfig
+from .configs import ServerConfig
+from .context import ServerContext
+from .context import ServerEpoch
+from .events import EventCallbacks
+from .groups import ProcessGroup
+from .groups import SubprocessFactory
+from .poller import Poller
+from .poller import get_poller_impl
+from .process import InheritedFds
+from .process import Subprocess
+from .signals import SignalReceiver
+from .supervisor import ProcessGroupFactory
+from .supervisor import ProcessGroups
+from .supervisor import SignalHandler
+from .supervisor import Supervisor
+from .types import AbstractProcessGroup
+from .types import AbstractServerContext
+from .types import AbstractSubprocess
+
+
+##
+
+
+def bind_server(
+        config: ServerConfig,
+        *,
+        server_epoch: ta.Optional[ServerEpoch] = None,
+        inherited_fds: ta.Optional[InheritedFds] = None,
+) -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(config),
+
+        inj.bind(get_poller_impl(), key=Poller, singleton=True),
+
+        inj.bind(ServerContext, singleton=True),
+        inj.bind(AbstractServerContext, to_key=ServerContext),
+
+        inj.bind(EventCallbacks, singleton=True),
+
+        inj.bind(SignalReceiver, singleton=True),
+
+        inj.bind(SignalHandler, singleton=True),
+        inj.bind(ProcessGroups, singleton=True),
+        inj.bind(Supervisor, singleton=True),
+    ]
+
+    #
+
+    def make_process_group_factory(injector: Injector) -> ProcessGroupFactory:
+        def inner(group_config: ProcessGroupConfig) -> ProcessGroup:
+            return injector.inject(functools.partial(ProcessGroup, group_config))
+        return ProcessGroupFactory(inner)
+    lst.append(inj.bind(make_process_group_factory))
+
+    def make_subprocess_factory(injector: Injector) -> SubprocessFactory:
+        def inner(process_config: ProcessConfig, group: AbstractProcessGroup) -> AbstractSubprocess:
+            return injector.inject(functools.partial(Subprocess, process_config, group))
+        return SubprocessFactory(inner)
+    lst.append(inj.bind(make_subprocess_factory))
+
+    #
+
+    if server_epoch is not None:
+        lst.append(inj.bind(server_epoch, key=ServerEpoch))
+    if inherited_fds is not None:
+        lst.append(inj.bind(inherited_fds, key=InheritedFds))
+
+    #
+
+    return inj.as_bindings(*lst)

ominfra/supervisor/main.py

@@ -1,41 +1,24 @@
 #!/usr/bin/env python3
 # ruff: noqa: UP006 UP007
 # @omlish-amalg ../scripts/supervisor.py
-import functools
 import itertools
 import os.path
 import typing as ta
 
-from omlish.lite.inject import Injector
-from omlish.lite.inject import InjectorBindingOrBindings
-from omlish.lite.inject import InjectorBindings
+from omlish.lite.http.coroserver import CoroHttpServer
 from omlish.lite.inject import inj
 from omlish.lite.journald import journald_log_handler_factory
 from omlish.lite.logs import configure_standard_logging
 
 from ..configs import read_config_file
-from .configs import ProcessConfig
-from .configs import ProcessGroupConfig
 from .configs import ServerConfig
 from .configs import prepare_server_config
 from .context import ServerContext
 from .context import ServerEpoch
-from .events import EventCallbacks
-from .groups import ProcessGroup
-from .groups import SubprocessFactory
-from .poller import Poller
-from .poller import get_poller_impl
+from .inject import bind_server
 from .process import InheritedFds
-from .process import Subprocess
-from .signals import SignalReceiver
 from .states import SupervisorState
-from .supervisor import ProcessGroupFactory
-from .supervisor import ProcessGroups
-from .supervisor import SignalHandler
 from .supervisor import Supervisor
-from .types import AbstractProcessGroup
-from .types import AbstractServerContext
-from .types import AbstractSubprocess
 from .utils import ExitNow
 from .utils import get_open_fds
 
@@ -43,63 +26,15 @@ from .utils import get_open_fds
 ##
 
 
-def build_server_bindings(
-        config: ServerConfig,
-        *,
-        server_epoch: ta.Optional[ServerEpoch] = None,
-        inherited_fds: ta.Optional[InheritedFds] = None,
-) -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = [
-        inj.bind(config),
-
-        inj.bind(get_poller_impl(), key=Poller, singleton=True),
-
-        inj.bind(ServerContext, singleton=True),
-        inj.bind(AbstractServerContext, to_key=ServerContext),
-
-        inj.bind(EventCallbacks, singleton=True),
-
-        inj.bind(SignalReceiver, singleton=True),
-
-        inj.bind(SignalHandler, singleton=True),
-        inj.bind(ProcessGroups, singleton=True),
-        inj.bind(Supervisor, singleton=True),
-    ]
-
-    #
-
-    def make_process_group_factory(injector: Injector) -> ProcessGroupFactory:
-        def inner(group_config: ProcessGroupConfig) -> ProcessGroup:
-            return injector.inject(functools.partial(ProcessGroup, group_config))
-        return ProcessGroupFactory(inner)
-    lst.append(inj.bind(make_process_group_factory))
-
-    def make_subprocess_factory(injector: Injector) -> SubprocessFactory:
-        def inner(process_config: ProcessConfig, group: AbstractProcessGroup) -> AbstractSubprocess:
-            return injector.inject(functools.partial(Subprocess, process_config, group))
-        return SubprocessFactory(inner)
-    lst.append(inj.bind(make_subprocess_factory))
-
-    #
-
-    if server_epoch is not None:
-        lst.append(inj.bind(server_epoch, key=ServerEpoch))
-    if inherited_fds is not None:
-        lst.append(inj.bind(inherited_fds, key=InheritedFds))
-
-    #
-
-    return inj.as_bindings(*lst)
-
-
-##
-
-
 def main(
         argv: ta.Optional[ta.Sequence[str]] = None,
         *,
         no_logging: bool = False,
 ) -> None:
+    server_cls = CoroHttpServer  # noqa
+
+    #
+
     import argparse
 
     parser = argparse.ArgumentParser()
@@ -133,14 +68,14 @@ def main(
             prepare=prepare_server_config,
         )
 
-        injector = inj.create_injector(build_server_bindings(
+        injector = inj.create_injector(bind_server(
             config,
             server_epoch=ServerEpoch(epoch),
             inherited_fds=inherited_fds,
         ))
 
-        context = injector.provide(ServerContext)
-        supervisor = injector.provide(Supervisor)
+        context = injector[ServerContext]
+        supervisor = injector[Supervisor]
 
         try:
             supervisor.main()

{ominfra-0.0.0.dev123.dist-info → ominfra-0.0.0.dev124.dist-info}/METADATA

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

{ominfra-0.0.0.dev123.dist-info → ominfra-0.0.0.dev124.dist-info}/RECORD

@@ -22,7 +22,7 @@ ominfra/clouds/aws/journald2aws/poster.py,sha256=hz1XuctW8GtLmfjhRvCFY6py52D4BzX
 ominfra/clouds/gcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/gcp/auth.py,sha256=3PyfRJNgajjMqJFem3SKui0CqGeHEsZlvbRhuxFcZG8,1348
 ominfra/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/deploy/_executor.py,sha256=q5XLH1nnj23QrM_5SFHqcBABfprfR7JpfBCsP4KixKw,34594
+ominfra/deploy/_executor.py,sha256=AZ6F7zcVMQRKZwOxfFTfsrj1IA42bIrZF22jiDLapoE,34654
 ominfra/deploy/configs.py,sha256=qi0kwT7G2NH7dXLOQic-u6R3yeadup_QtvrjwWIggbM,435
 ominfra/deploy/remote.py,sha256=6ACmpXU1uBdyGs3Xsp97ktKFq30cJlzN9LRWNUWlGY4,2144
 ominfra/deploy/executor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -37,7 +37,7 @@ ominfra/deploy/executor/concerns/systemd.py,sha256=MtsSEToEa1HNouern_JukcYTnypw_
 ominfra/deploy/executor/concerns/user.py,sha256=j5LDfQXquIp-eEM7t6aShsrYoQrM_ILXZycTmTcRVxA,686
 ominfra/deploy/executor/concerns/venv.py,sha256=jbRriqJHO4r9Zyo5Hfl_qVmcU6Qm6UgrouBroKcPn2g,775
 ominfra/deploy/poly/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
-ominfra/deploy/poly/_main.py,sha256=N-ajqT7UPdacBbFViTyzDkbM8y2kyH4lzGKsV4lN7uo,24198
+ominfra/deploy/poly/_main.py,sha256=1I6fQY-_iUk4FmT1fQviSRQReuy4VCHQKGLenda1F_g,24176
 ominfra/deploy/poly/base.py,sha256=Bd-CzUTaDvTRbdXKiTxMxs77WCEXItwNoBYCRnTk1u4,4167
 ominfra/deploy/poly/configs.py,sha256=9bzWdbxhOk_Q4KokDjmRz254KHnUU71Vl1frLlhQyU4,584
 ominfra/deploy/poly/deploy.py,sha256=tMYKslXLjstcv86siRt5j37USsS0Wd6lsfeGRE26zio,544
@@ -56,12 +56,13 @@ ominfra/journald/tailer.py,sha256=5abcFMfgi7fnY9ZEQe2ZVobaJxjQkeu6d9Kagw33a1w,33
 ominfra/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/manage.py,sha256=BttL8LFEknHZE_h2Pt5dAqbfUkv6qy43WI0raXBZ1a8,151
 ominfra/pyremote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote/_runcommands.py,sha256=zlNvob9gaUdwG2UJkra5sz0PpxJcQvaidah43ySKfys,28430
+ominfra/pyremote/_runcommands.py,sha256=EDTp6NOgux8ZJw-tcIHtfafc-fHLh5KuhghA3Xemhy8,28490
 ominfra/pyremote/bootstrap.py,sha256=RvMO3YGaN1E4sgUi1JEtiPak8cjvqtc_vRCq1yqbeZg,3370
 ominfra/pyremote/runcommands.py,sha256=bviS0_TDIoZVAe4h-_iavbvJtVSFu8lnk7fQ5iasCWE,1571
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=1bP8b-k9Z-so4Yk0AY6GZkheknO2Wdtf3V_6Y3M2bbk,128480
-ominfra/scripts/supervisor.py,sha256=2AcNVdw7e68TcNrl4R9XeFtJFr_x3mPxNsI0UFoBVB8,174176
+ominfra/scripts/journald2aws.py,sha256=veQDwe0RQ3EYLW5jSsNJCUOx6RTLb_7FXUN7fBSgWUc,128540
+ominfra/scripts/supervisor.py,sha256=eapWDO0oWjj_nAggu7LhzI3GgbmgjxD5HtSDRl20AgE,206584
+ominfra/supervisor/LICENSE.txt,sha256=JRTq7xHjDCpDPCeo0OfCYymSm9Vwl7n7rQWg342NpxI,1780
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
 ominfra/supervisor/configs.py,sha256=TtVyWdxinrd3tueM6q8j2YVcEqauFTJqlbykkSjByEo,3524
@@ -71,7 +72,8 @@ ominfra/supervisor/dispatchers.py,sha256=rpcYYGb2CkCgmPMrxeN-jTxr-PZffZ1OA9lQr4F
 ominfra/supervisor/events.py,sha256=01pet30KrzS4LszeKy0JUCMhMO8_OwuxvvDjfI_eGQQ,6593
 ominfra/supervisor/exceptions.py,sha256=Qbu211H3CLlSmi9LsSikOwrcL5HgJP9ugvcKWlGTAoI,750
 ominfra/supervisor/groups.py,sha256=VgFHgDwtCFumM8Qr5kbQ6e4xoau6tBQuW4lrKox_Z9o,4610
-ominfra/supervisor/main.py,sha256=fxPKeJuPT-fqcGaADZct0HTd_Ovje03vEMovsL9wtCc,4570
+ominfra/supervisor/inject.py,sha256=srRErrQkxytLSKUedN4HFoFF5Eb4f_TEw1eu0aKlHMU,2599
+ominfra/supervisor/main.py,sha256=gd9tBBg46sJInxCk_OCkRFkAaQ3qhLKfjZeRXvU2LNY,2324
 ominfra/supervisor/poller.py,sha256=-gY_GIjuYr0J6ql_tFwKhlzRN4_mQaiVgMDOEHx_54Y,7693
 ominfra/supervisor/process.py,sha256=dpVG7eX8q9nsIA0uH7KrJwdZGbhtw6ZAXWG8LsMpWnY,28306
 ominfra/supervisor/signals.py,sha256=tv1CJm3Xrb69KVSswqm_u2vr2Lb2AbTxBVtQqIOSeyk,1176
@@ -84,9 +86,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=DSGp4hn5xwOW-l_u_InKlSF6kIobxtUtVssf_73STs0,3567
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev123.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev123.dist-info/METADATA,sha256=0WOejBCOaFJ0T1GfM0nHTQ2EgEu8qWIdPjJsxLBMATA,742
-ominfra-0.0.0.dev123.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-ominfra-0.0.0.dev123.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev123.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev123.dist-info/RECORD,,
+ominfra-0.0.0.dev124.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev124.dist-info/METADATA,sha256=D1ueiVHDML8TevQC4EPHfEyeKZK_bfl2JY_lPoLxMkQ,731
+ominfra-0.0.0.dev124.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev124.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev124.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev124.dist-info/RECORD,,

{ominfra-0.0.0.dev123.dist-info → ominfra-0.0.0.dev124.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any