ominfra 0.0.0.dev368__py3-none-any.whl → 0.0.0.dev501__py3-none-any.whl

ominfra/supervisor/configs.py

@@ -82,14 +82,14 @@ class ProcessConfig:
     # containing group_name, host_node_name, process_num, program_name, and here (the directory of the supervisord
     # config file). Values containing non-alphanumeric characters should be quoted (e.g. KEY="val:123",KEY2="val,456").
     # Otherwise, quoting the values is optional but recommended. Note that the subprocess will inherit the environment
-    # variables of the shell used to start “supervisord” except for the ones overridden here.
+    # variables of the shell used to start "supervisord" except for the ones overridden here.
     environment: ta.Optional[ta.Mapping[str, str]] = None
 
     #
 
     # The relative priority of the program in the start and shutdown ordering. Lower priorities indicate programs that
-    # start first and shut down last at startup and when aggregate commands are used in various clients (e.g. “start
-    # all”/”stop all”). Higher priorities indicate programs that start last and shut down first.
+    # start first and shut down last at startup and when aggregate commands are used in various clients (e.g. "start
+    # all"/"stop all"). Higher priorities indicate programs that start last and shut down first.
     priority: int = 999
 
     # If true, this program will start automatically when supervisord is started.
@@ -111,7 +111,7 @@ class ProcessConfig:
     # successful (moving the process from the STARTING state to the RUNNING state). Set to 0 to indicate that the
     # program needn't stay running for any particular amount of time.
     #
-    # Note: Even if a process exits with an “expected” exit code (see exitcodes), the start will still be considered a
+    # Note: Even if a process exits with an "expected" exit code (see exitcodes), the start will still be considered a
     # failure if the process exits quicker than startsecs.
     start_secs: int = 1
 
@@ -140,7 +140,7 @@ class ProcessConfig:
     # taking care of its children as well, useful e.g with Python programs using multiprocessing.
     kill_as_group: bool = False
 
-    # The list of “expected” exit codes for this program used with autorestart. If the autorestart parameter is set to
+    # The list of "expected" exit codes for this program used with autorestart. If the autorestart parameter is set to
     # unexpected, and the process exits in any other way than as a result of a supervisor stop request, supervisord will
     # restart the process if it exits with an exit code that is not defined in this list.
     #
@@ -222,7 +222,7 @@ class ServerConfig:
     logfile: str = 'supervisord.log'
 
     # The maximum number of bytes that may be consumed by the activity log file before it is rotated (suffix multipliers
-    # like “KB”, “MB”, and “GB” can be used in the value). Set this value to 0 to indicate an unlimited log size.
+    # like "KB", "MB", and "GB" can be used in the value). Set this value to 0 to indicate an unlimited log size.
     logfile_max_bytes: int = 50 * 1024 * 1024
 
     # The number of backups to keep around resulting from activity log file rotation. If set to 0, no backups will be

ominfra/supervisor/dispatchers.py

@@ -6,6 +6,9 @@ from .utils.collections import KeyedCollection
 from .utils.ostypes import Fd
 
 
+##
+
+
 class Dispatchers(KeyedCollection[Fd, FdioHandler]):
     def _key(self, v: FdioHandler) -> Fd:
         return Fd(v.fd())

ominfra/supervisor/dispatchersimpl.py

@@ -1,11 +1,11 @@
 # ruff: noqa: UP006 UP007 UP045
-import abc
 import errno
 import logging
 import os
 import typing as ta
 
-from omlish.lite.logs import log
+from omlish.lite.abstract import Abstract
+from omlish.logs.modules import get_module_logger
 
 from .configs import ProcessConfig
 from .configs import ServerConfig
@@ -26,7 +26,13 @@ from .utils.strings import find_prefix_at_end
 from .utils.strings import strip_escapes
 
 
-class BaseProcessDispatcherImpl(ProcessDispatcher, abc.ABC):
+log = get_module_logger(globals())  # noqa
+
+
+##
+
+
+class BaseProcessDispatcherImpl(ProcessDispatcher, Abstract):
     def __init__(
             self,
             process: Process,

ominfra/supervisor/events.py

@@ -1,12 +1,12 @@
 # ruff: noqa: UP006 UP007 UP045
-import abc
 import typing as ta
 
-from .states import ProcessState
+from omlish.lite.abstract import Abstract
 
+from .states import ProcessState
 
-EventCallback = ta.Callable[['Event'], None]
 
+EventCallback = ta.Callable[['Event'], None]  # ta.TypeAlias
 
 ProcessOutputChannel = ta.Literal['stdout', 'stderr']  # ta.TypeAlias
 
@@ -14,7 +14,7 @@ ProcessOutputChannel = ta.Literal['stdout', 'stderr']  # ta.TypeAlias
 ##
 
 
-class Event(abc.ABC):  # noqa
+class Event(Abstract):
     """Abstract event type."""
 
 
@@ -45,11 +45,12 @@ class EventCallbacks:
 ##
 
 
-class ProcessLogEvent(Event, abc.ABC):
+class ProcessLogEvent(Event, Abstract):
     channel: ta.ClassVar[ProcessOutputChannel]
 
     def __init__(self, process, pid, data):
         super().__init__()
+
         self.process = process
         self.pid = pid
         self.data = data
@@ -66,7 +67,7 @@ class ProcessLogStderrEvent(ProcessLogEvent):
 #
 
 
-class ProcessCommunicationEvent(Event, abc.ABC):
+class ProcessCommunicationEvent(Event, Abstract):
     # event mode tokens
     BEGIN_TOKEN = b'<!--XSUPERVISOR:BEGIN-->'
     END_TOKEN = b'<!--XSUPERVISOR:END-->'
@@ -75,6 +76,7 @@ class ProcessCommunicationEvent(Event, abc.ABC):
 
     def __init__(self, process, pid, data):
         super().__init__()
+
         self.process = process
         self.pid = pid
         self.data = data
@@ -94,6 +96,7 @@ class ProcessCommunicationStderrEvent(ProcessCommunicationEvent):
 class RemoteCommunicationEvent(Event):
     def __init__(self, type, data):  # noqa
         super().__init__()
+
         self.type = type
         self.data = data
 
@@ -119,6 +122,7 @@ class SupervisorStoppingEvent(SupervisorStateChangeEvent):
 class EventRejectedEvent:  # purposely does not subclass Event
     def __init__(self, process, event):
         super().__init__()
+
         self.process = process
         self.event = event
 
@@ -133,6 +137,7 @@ class ProcessStateEvent(Event):
 
     def __init__(self, process, from_state, expected=True):
         super().__init__()
+
         self.process = process
         self.from_state = from_state
         self.expected = expected
@@ -203,6 +208,7 @@ PROCESS_STATE_EVENT_MAP: ta.Mapping[ProcessState, ta.Type[ProcessStateEvent]] =
 class ProcessGroupEvent(Event):
     def __init__(self, group):
         super().__init__()
+
         self.group = group
 
 
@@ -222,6 +228,7 @@ class TickEvent(Event):
 
     def __init__(self, when, supervisord):
         super().__init__()
+
         self.when = when
         self.supervisord = supervisord
 

ominfra/supervisor/groups.py

@@ -12,6 +12,9 @@ from .types import ProcessGroup
 from .utils.collections import KeyedCollectionAccessors
 
 
+##
+
+
 class ProcessGroupManager(
     KeyedCollectionAccessors[str, ProcessGroup],
     HasDispatchers,

ominfra/supervisor/groupsimpl.py

@@ -11,6 +11,9 @@ from .types import Process
 from .types import ProcessGroup
 
 
+##
+
+
 class ProcessFactory(Func2[ProcessConfig, ProcessGroup, Process]):
     pass
 

ominfra/supervisor/http.py

@@ -4,7 +4,7 @@ import json
 import socket
 import typing as ta
 
-from omlish.http.coro.fdio import CoroHttpServerConnectionFdioHandler
+from omlish.http.coro.server.fdio import CoroHttpServerConnectionFdioHandler
 from omlish.http.handlers import HttpHandler
 from omlish.http.handlers import HttpHandler_
 from omlish.http.handlers import HttpHandlerRequest

ominfra/supervisor/inject.py

@@ -45,6 +45,9 @@ from .utils.signals import SignalReceiver
 from .utils.users import get_user
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class _FdioPollerDaemonizeListener(DaemonizeListener):
     _poller: FdioPoller

ominfra/supervisor/io.py

@@ -2,7 +2,7 @@
 import typing as ta
 
 from omlish.io.fdio.pollers import FdioPoller
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from .dispatchers import Dispatchers
 from .types import ExitNow
@@ -10,6 +10,9 @@ from .types import HasDispatchers
 from .utils.ostypes import Fd
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/supervisor/main.py

@@ -37,12 +37,12 @@ import itertools
 import os.path
 import typing as ta
 
-from omlish.http.coro.server import CoroHttpServer
+from omlish.http.coro.server.server import CoroHttpServer
 from omlish.lite.configs import load_config_file_obj
 from omlish.lite.inject import inj
 from omlish.lite.runtime import is_debugger_attached
-from omlish.logs.standard import configure_standard_logging
-from omlish.os.journald import journald_log_handler_factory
+from omlish.logs.std.standard import configure_standard_logging
+from omlish.os.journald import journald_logging_handler_factory
 
 from .configs import ServerConfig
 from .configs import prepare_server_config
@@ -83,7 +83,7 @@ def main(
     if not no_logging:
         configure_standard_logging(
             'INFO',
-            handler_factory=journald_log_handler_factory if not (args.no_journald or is_debugger_attached()) else None,
+            handler_factory=journald_logging_handler_factory if not (args.no_journald or is_debugger_attached()) else None,  # noqa
         )
 
     #

ominfra/supervisor/pipes.py

@@ -9,6 +9,9 @@ from .utils.fds import make_pipe
 from .utils.ostypes import Fd
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class ProcessPipes:
     child_stdin: ta.Optional[Fd] = None

ominfra/supervisor/privileges.py

@@ -5,6 +5,9 @@ import pwd
 import typing as ta
 
 
+##
+
+
 def drop_privileges(user: ta.Union[int, str, None]) -> ta.Optional[str]:
     """
     Drop privileges to become the specified user, which may be a username or uid. Called for supervisord startup and

ominfra/supervisor/processimpl.py

@@ -7,8 +7,8 @@ import traceback
 import typing as ta
 
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.typing import Func1
+from omlish.logs.modules import get_module_logger
 
 from .configs import ProcessConfig
 from .configs import RestartUnconditionally
@@ -36,6 +36,9 @@ class ProcessSpawningFactory(Func1[Process, ProcessSpawning]):
     pass
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/supervisor/setup.py

@@ -2,6 +2,8 @@
 import abc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
+
 from .utils.users import User
 
 
@@ -14,7 +16,7 @@ SupervisorUser = ta.NewType('SupervisorUser', User)
 ##
 
 
-class DaemonizeListener(abc.ABC):  # noqa
+class DaemonizeListener(Abstract):
     def before_daemonize(self) -> None:  # noqa
         pass
 
@@ -28,7 +30,7 @@ DaemonizeListeners = ta.NewType('DaemonizeListeners', ta.Sequence[DaemonizeListe
 ##
 
 
-class SupervisorSetup(abc.ABC):
+class SupervisorSetup(Abstract):
     @abc.abstractmethod
     def setup(self) -> None:
         raise NotImplementedError

ominfra/supervisor/setupimpl.py

@@ -6,7 +6,7 @@ import typing as ta
 import warnings
 
 from omlish.lite.cached import cached_nullary
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from .configs import ServerConfig
 from .privileges import drop_privileges
@@ -19,6 +19,9 @@ from .utils.os import real_exit
 from .utils.ostypes import Rc
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/supervisor/signals.py

@@ -1,7 +1,7 @@
 # ruff: noqa: UP006 UP007 UP045
 import signal
 
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from .groups import ProcessGroupManager
 from .states import SupervisorState
@@ -11,6 +11,12 @@ from .utils.signals import SignalReceiver
 from .utils.signals import sig_name
 
 
+log = get_module_logger(globals())  # noqa
+
+
+##
+
+
 class SignalHandler:
     def __init__(
             self,

ominfra/supervisor/spawning.py

@@ -8,6 +8,9 @@ from .types import Process
 from .utils.ostypes import Pid
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class SpawnedProcess:
     pid: Pid

ominfra/supervisor/supervisor.py

@@ -4,8 +4,8 @@ import typing as ta
 
 from omlish.io.fdio.pollers import FdioPoller
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.typing import Func1
+from omlish.logs.modules import get_module_logger
 
 from .configs import ProcessGroupConfig
 from .configs import ServerConfig
@@ -27,6 +27,9 @@ from .utils.os import decode_wait_status
 from .utils.os import waitpid
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/supervisor/types.py

@@ -4,6 +4,7 @@ import functools
 import typing as ta
 
 from omlish.io.fdio.handlers import FdioHandler
+from omlish.lite.abstract import Abstract
 
 from .configs import ProcessConfig
 from .configs import ProcessGroupConfig
@@ -33,7 +34,7 @@ ServerEpoch = ta.NewType('ServerEpoch', int)
 
 
 @functools.total_ordering
-class ConfigPriorityOrdered(abc.ABC):
+class ConfigPriorityOrdered(Abstract):
     @property
     @abc.abstractmethod
     def config(self) -> ta.Any:
@@ -52,7 +53,7 @@ class ConfigPriorityOrdered(abc.ABC):
 ##
 
 
-class SupervisorStateManager(abc.ABC):
+class SupervisorStateManager(Abstract):
     @property
     @abc.abstractmethod
     def state(self) -> SupervisorState:
@@ -66,13 +67,13 @@ class SupervisorStateManager(abc.ABC):
 ##
 
 
-class HasDispatchers(abc.ABC):
+class HasDispatchers(Abstract):
     @abc.abstractmethod
     def get_dispatchers(self) -> 'Dispatchers':
         raise NotImplementedError
 
 
-class ProcessDispatcher(FdioHandler, abc.ABC):
+class ProcessDispatcher(FdioHandler, Abstract):
     @property
     @abc.abstractmethod
     def channel(self) -> ProcessOutputChannel:
@@ -84,7 +85,7 @@ class ProcessDispatcher(FdioHandler, abc.ABC):
         raise NotImplementedError
 
 
-class ProcessOutputDispatcher(ProcessDispatcher, abc.ABC):
+class ProcessOutputDispatcher(ProcessDispatcher, Abstract):
     @abc.abstractmethod
     def remove_logs(self) -> None:
         raise NotImplementedError
@@ -94,7 +95,7 @@ class ProcessOutputDispatcher(ProcessDispatcher, abc.ABC):
         raise NotImplementedError
 
 
-class ProcessInputDispatcher(ProcessDispatcher, abc.ABC):
+class ProcessInputDispatcher(ProcessDispatcher, Abstract):
     @abc.abstractmethod
     def write(self, chars: ta.Union[bytes, str]) -> None:
         raise NotImplementedError
@@ -110,7 +111,7 @@ class ProcessInputDispatcher(ProcessDispatcher, abc.ABC):
 class Process(
     ConfigPriorityOrdered,
     HasDispatchers,
-    abc.ABC,
+    Abstract,
 ):
     @property
     @abc.abstractmethod
@@ -166,7 +167,7 @@ class Process(
 class ProcessGroup(
     ConfigPriorityOrdered,
     KeyedCollectionAccessors[str, Process],
-    abc.ABC,
+    Abstract,
 ):
     @property
     @abc.abstractmethod

ominfra/supervisor/utils/collections.py

@@ -2,12 +2,17 @@
 import abc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
+
 
 K = ta.TypeVar('K')
 V = ta.TypeVar('V')
 
 
-class KeyedCollectionAccessors(abc.ABC, ta.Generic[K, V]):
+##
+
+
+class KeyedCollectionAccessors(Abstract, ta.Generic[K, V]):
     @property
     @abc.abstractmethod
     def _by_key(self) -> ta.Mapping[K, V]:
@@ -32,7 +37,7 @@ class KeyedCollectionAccessors(abc.ABC, ta.Generic[K, V]):
         return iter(self._by_key.items())
 
 
-class KeyedCollection(KeyedCollectionAccessors[K, V]):
+class KeyedCollection(KeyedCollectionAccessors[K, V], Abstract):
     def __init__(self, items: ta.Iterable[V]) -> None:
         super().__init__()
 

ominfra/supervisor/utils/diag.py

@@ -4,6 +4,9 @@ import types
 import typing as ta
 
 
+##
+
+
 def compact_traceback() -> ta.Tuple[
     ta.Tuple[str, str, int],
     ta.Type[BaseException],

ominfra/supervisor/utils/fds.py

@@ -6,6 +6,9 @@ import typing as ta
 from .ostypes import Fd
 
 
+##
+
+
 class PipeFds(ta.NamedTuple):
     r: Fd
     w: Fd

ominfra/supervisor/utils/fs.py

@@ -4,6 +4,9 @@ import tempfile
 import typing as ta
 
 
+##
+
+
 def try_unlink(path: str) -> bool:
     try:
         os.unlink(path)

ominfra/supervisor/utils/os.py

@@ -1,9 +1,10 @@
 # ruff: noqa: UP006 UP007 UP045
 import errno
-import logging
 import os
 import typing as ta
 
+from omlish.logs.protocols import LoggerLike
+
 from .ostypes import Pid
 from .ostypes import Rc
 from .signals import sig_name
@@ -58,7 +59,7 @@ class WaitedPid(ta.NamedTuple):
 
 def waitpid(
         *,
-        log: ta.Optional[logging.Logger] = None,
+        log: ta.Optional[LoggerLike] = None,
 ) -> ta.Optional[WaitedPid]:
     # Need pthread_sigmask here to avoid concurrent sigchld, but Python doesn't offer in Python < 3.4. There is
     # still a race condition here; we can get a sigchld while we're sitting in the waitpid call. However, AFAICT, if

ominfra/supervisor/utils/strings.py

@@ -66,6 +66,7 @@ class SuffixMultiplier:
     # case insensitive. Return values are in the fundamental unit.
     def __init__(self, d, default=1):
         super().__init__()
+
         self._d = d
         self._default = default
         # all keys must be the same size

ominfra/threadworkers.py

@@ -16,18 +16,22 @@ import threading
 import time
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.contextmanagers import ExitStacked
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 
 T = ta.TypeVar('T')
 ThreadWorkerT = ta.TypeVar('ThreadWorkerT', bound='ThreadWorker')
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
-class ThreadWorker(ExitStacked, abc.ABC):
+class ThreadWorker(ExitStacked, Abstract):
     def __init__(
             self,
             *,

ominfra/tools/listresources.py

@@ -132,7 +132,7 @@ class GcpServer(Server):
 
 def get_gcp_servers() -> list[GcpServer]:
     cfg = _get_secrets()
-    creds = cfg.try_get('gcp_oauth2').reveal()
+    creds = cfg.get('gcp_oauth2').reveal()
 
     from google.oauth2 import service_account
     credentials = service_account.Credentials.from_service_account_info(json.loads(creds))

ominfra-0.0.0.dev501.dist-info/METADATA

@@ -0,0 +1,54 @@
+Metadata-Version: 2.4
+Name: ominfra
+Version: 0.0.0.dev501
+Summary: ominfra
+Author: wrmsr
+License-Expression: BSD-3-Clause
+Project-URL: source, https://github.com/wrmsr/omlish
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.13
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: omlish==0.0.0.dev501
+Provides-Extra: all
+Requires-Dist: omdev==0.0.0.dev501; extra == "all"
+Requires-Dist: paramiko~=4.0; extra == "all"
+Requires-Dist: asyncssh~=2.22; extra == "all"
+Provides-Extra: omdev
+Requires-Dist: omdev==0.0.0.dev501; extra == "omdev"
+Provides-Extra: ssh
+Requires-Dist: paramiko~=4.0; extra == "ssh"
+Requires-Dist: asyncssh~=2.22; extra == "ssh"
+Dynamic: license-file
+
+# Overview
+
+Infrastructure and cloud code.
+
+# Notable packages
+
+- **[clouds.aws](https://github.com/wrmsr/omlish/blob/master/ominfra/clouds/aws)** - boto-less aws tools, including
+  authentication and generated service dataclasses.
+
+- **[journald2aws](https://github.com/wrmsr/omlish/blob/master/ominfra/clouds/aws/journald2aws)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/ominfra/scripts/journald2aws.py)) - a self-contained little tool
+  that forwards journald to cloudwatch.
+
+- **[pyremote](https://github.com/wrmsr/omlish/blob/master/ominfra/pyremote.py)** - does the
+  [mitogen trick](https://mitogen.networkgenomics.com/howitworks.html) to facilitate remote execution of python code.
+  due to amalgamation, import shenanigans aren't required to do useful work.
+
+- **[manage](https://github.com/wrmsr/omlish/blob/master/ominfra/manage)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/ominfra/scripts/manage.py)) - a remote system management tool,
+  including a code deployment system. inspired by things like [mitogen](https://mitogen.networkgenomics.com/),
+  [pyinfra](https://github.com/pyinfra-dev/pyinfra), [piku](https://github.com/piku/piku). uses pyremote.
+
+- **[supervisor](https://github.com/wrmsr/omlish/blob/master/ominfra/supervisor)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/ominfra/scripts/supervisor.py)) - an overhauled,
+  [amalgamated](https://github.com/wrmsr/omlish/blob/master/omdev#amalgamation) fork of
+  [supervisor](https://github.com/Supervisor/supervisor)