ominfra 0.0.0.dev154__py3-none-any.whl → 0.0.0.dev156__py3-none-any.whl

ominfra/scripts/supervisor.py

@@ -1726,8 +1726,6 @@ def async_cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 """
 TODO:
  - def maybe(v: lang.Maybe[T])
- - patch / override lite.check ?
-  - checker interface?
 """
 
 
@@ -3789,6 +3787,20 @@ def attr_setting(obj, attr, val, *, default=None):  # noqa
             setattr(obj, attr, orig)
 
 
+##
+
+
+class aclosing(contextlib.AbstractAsyncContextManager):  # noqa
+    def __init__(self, thing):
+        self.thing = thing
+
+    async def __aenter__(self):
+        return self.thing
+
+    async def __aexit__(self, *exc_info):
+        await self.thing.aclose()
+
+
 ########################################
 # ../../../omlish/lite/inject.py
 
@@ -4957,7 +4969,8 @@ def configure_standard_logging(
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - nonstrict toggle
+ - namedtuple
+ - literals
 """
 
 
@@ -5247,14 +5260,18 @@ class ObjMarshalerManager:
     ) -> ObjMarshaler:
         if isinstance(ty, type):
             if abc.ABC in ty.__bases__:
-                return PolymorphicObjMarshaler.of([  # type: ignore
+                impls = [ity for ity in deep_subclasses(ty) if abc.ABC not in ity.__bases__]  # type: ignore
+                if all(ity.__qualname__.endswith(ty.__name__) for ity in impls):
+                    ins = {ity: snake_case(ity.__qualname__[:-len(ty.__name__)]) for ity in impls}
+                else:
+                    ins = {ity: ity.__qualname__ for ity in impls}
+                return PolymorphicObjMarshaler.of([
                     PolymorphicObjMarshaler.Impl(
                         ity,
-                        ity.__qualname__,
+                        itn,
                         rec(ity),
                     )
-                    for ity in deep_subclasses(ty)
-                    if abc.ABC not in ity.__bases__
+                    for ity, itn in ins.items()
                 ])
 
             if issubclass(ty, enum.Enum):
@@ -5816,22 +5833,124 @@ class RestartUnconditionally:
 
 @dc.dataclass(frozen=True)
 class ProcessConfig:
+    # A Python string expression that is used to compose the supervisor process name for this process. You usually don't
+    # need to worry about setting this unless you change numprocs. The string expression is evaluated against a
+    # dictionary that includes group_name, host_node_name, process_num, program_name, and here (the directory of the
+    # supervisord config file).
     name: str
+
+    # The command that will be run when this program is started. The command can be either absolute (e.g.
+    # /path/to/programname) or relative (e.g. programname). If it is relative, the supervisord's environment $PATH will
+    # be searched for the executable. Programs can accept arguments, e.g. /path/to/program foo bar. The command line can
+    # use double quotes to group arguments with spaces in them to pass to the program, e.g. /path/to/program/name -p
+    # "foo bar". Note that the value of command may include Python string expressions, e.g. /path/to/programname
+    # --port=80%(process_num)02d might expand to /path/to/programname --port=8000 at runtime. String expressions are
+    # evaluated against a dictionary containing the keys group_name, host_node_name, program_name, process_num,
+    # numprocs, here (the directory of the supervisord config file), and all supervisord's environment variables
+    # prefixed with ENV_. Controlled programs should themselves not be daemons, as supervisord assumes it is responsible
+    # for daemonizing its subprocesses
     command: str
 
+    #
+
+    # Supervisor will start as many instances of this program as named by numprocs. Note that if numprocs > 1, the
+    # process_name expression must include %(process_num)s (or any other valid Python string expression that includes
+    # process_num) within it.
+    num_procs: int = 1
+
+    # An integer offset that is used to compute the number at which process_num starts.
+    num_procs_start: int = 0
+
+    #
+
+    # Instruct supervisord to use this UNIX user account as the account which runs the program. The user can only be
+    # switched if supervisord is run as the root user. If supervisord can't switch to the specified user, the program
+    # will not be started.
+    #
+    # Note: The user will be changed using setuid only. This does not start a login shell and does not change
+    # environment variables like USER or HOME
+    user: ta.Optional[str] = None
     uid: ta.Optional[int] = None
-    directory: ta.Optional[str] = None
+
+    # An octal number (e.g. 002, 022) representing the umask of the process.
     umask: ta.Optional[int] = None
+
+    #
+
+    # A file path representing a directory to which supervisord should temporarily chdir before exec'ing the child.
+    directory: ta.Optional[str] = None
+
+    # A list of key/value pairs in the form KEY="val",KEY2="val2" that will be placed in the child process' environment.
+    # The environment string may contain Python string expressions that will be evaluated against a dictionary
+    # 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.
+    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.
     priority: int = 999
 
+    # If true, this program will start automatically when supervisord is started.
     auto_start: bool = True
+
+    # Specifies if supervisord should automatically restart a process if it exits when it is in the RUNNING state. May
+    # be one of false, unexpected, or true. If false, the process will not be autorestarted. If unexpected, the process
+    # will be restarted when the program exits with an exit code that is not one of the exit codes associated with this
+    # process' configuration (see exitcodes). If true, the process will be unconditionally restarted when it exits,
+    # without regard to its exit code.
+    #
+    # Note: autorestart controls whether supervisord will autorestart a program if it exits after it has successfully
+    # started up (the process is in the RUNNING state). supervisord has a different restart mechanism for when the
+    # process is starting up (the process is in the STARTING state). Retries during process startup are controlled by
+    # startsecs and startretries.
     auto_restart: str = 'unexpected'
 
+    # The total number of seconds which the program needs to stay running after a startup to consider the start
+    # 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
+    # failure if the process exits quicker than startsecs.
     start_secs: int = 1
+
+    # The number of serial failure attempts that supervisord will allow when attempting to start the program before
+    # giving up and putting the process into an FATAL state.
+    #
+    # Note: After each failed restart, process will be put in BACKOFF state and each retry attempt will take
+    # increasingly more time.
     start_retries: int = 3
 
-    num_procs: int = 1
-    num_procs_start: int = 0
+    # The signal used to kill the program when a stop is requested. This can be specified using the signal's name or its
+    # number. It is normally one of: TERM, HUP, INT, QUIT, KILL, USR1, or USR2.
+    stop_signal: int = signal.SIGTERM
+
+    # The number of seconds to wait for the OS to return a SIGCHLD to supervisord after the program has been sent a
+    # stopsignal. If this number of seconds elapses before supervisord receives a SIGCHLD from the process, supervisord
+    # will attempt to kill it with a final SIGKILL.
+    stop_wait_secs: int = 10
+
+    # If true, the flag causes supervisor to send the stop signal to the whole process group and implies killasgroup is
+    # true. This is useful for programs, such as Flask in debug mode, that do not propagate stop signals to their
+    # children, leaving them orphaned.
+    stop_as_group: bool = False
+
+    # If true, when resorting to send SIGKILL to the program to terminate it send it to its whole process group instead,
+    # 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
+    # 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.
+    #
+    # Note: In Supervisor versions prior to 4.0, the default was 0,2. In Supervisor 4.0, the default was changed to 0.
+    exitcodes: ta.Sequence[int] = (0,)
+
+    #
 
     @dc.dataclass(frozen=True)
     class Log:
@@ -5845,18 +5964,14 @@ class ProcessConfig:
     stdout: Log = Log()
     stderr: Log = Log()
 
-    stop_signal: int = signal.SIGTERM
-    stop_wait_secs: int = 10
-    stop_as_group: bool = False
-
-    kill_as_group: bool = False
-
-    exitcodes: ta.Sequence[int] = (0,)
-
+    # If true, cause the process' stderr output to be sent back to supervisord on its stdout file descriptor (in UNIX
+    # shell terms, this is the equivalent of executing /the/program 2>&1).
+    #
+    # Note: Do not set redirect_stderr=true in an [eventlistener:x] section. Eventlisteners use stdout and stdin to
+    # communicate with supervisord. If stderr is redirected, output from stderr will interfere with the eventlistener
+    # protocol.
     redirect_stderr: bool = False
 
-    environment: ta.Optional[ta.Mapping[str, str]] = None
-
 
 @dc.dataclass(frozen=True)
 class ProcessGroupConfig:
@@ -5869,28 +5984,75 @@ class ProcessGroupConfig:
 
 @dc.dataclass(frozen=True)
 class ServerConfig:
+    # Instruct supervisord to switch users to this UNIX user account before doing any meaningful processing. The user
+    # can only be switched if supervisord is started as the root user.
     user: ta.Optional[str] = None
+
+    # If true, supervisord will start in the foreground instead of daemonizing.
     nodaemon: bool = False
+
+    # The umask of the supervisord process.
     umask: int = 0o22
+
+    #
+
+    # When supervisord daemonizes, switch to this directory. This option can include the value %(here)s, which expands
+    # to the directory in which the supervisord configuration file was found.
     directory: ta.Optional[str] = None
-    logfile: str = 'supervisord.log'
-    logfile_max_bytes: int = 50 * 1024 * 1024
-    logfile_backups: int = 10
-    loglevel: int = logging.INFO
+
+    # The location in which supervisord keeps its pid file. This option can include the value %(here)s, which expands to
+    # the directory in which the supervisord configuration file was found.
     pidfile: str = 'supervisord.pid'
+
+    # The identifier string for this supervisor process, used by the RPC interface.
     identifier: str = 'supervisor'
-    child_logdir: str = '/dev/null'
+
+    # The minimum number of file descriptors that must be available before supervisord will start successfully.
     min_fds: int = 1024
+    # The minimum number of process descriptors that must be available before supervisord will start successfully.
     min_procs: int = 200
+
+    # Prevent supervisord from clearing any existing AUTO child log files at startup time. Useful for debugging
     nocleanup: bool = False
+
+    # Strip all ANSI escape sequences from child log files.
     strip_ansi: bool = False
+
+    #
+
+    # The path to the activity log of the supervisord process. This option can include the value %(here)s, which expands
+    # to the directory in which the supervisord configuration file was found.
+    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.
+    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
+    # kept.
+    logfile_backups: int = 10
+
+    # The logging level, dictating what is written to the supervisord activity log. One of critical, error, warn, info,
+    # debug, trace, or blather. Note that at log level debug, the supervisord log file will record the stderr/stdout
+    # output of its child processes and extended info about process state changes, which is useful for debugging a
+    # process which isn't starting properly.
+    loglevel: int = logging.INFO
+
+    # The directory used for AUTO child log files. This option can include the value %(here)s, which expands to the
+    # directory in which the supervisord configuration file was found.
+    child_logdir: str = '/dev/null'
+
+    # If true and not daemonized, logs will not be directed to stdout.
     silent: bool = False
 
+    #
+
     groups: ta.Optional[ta.Sequence[ProcessGroupConfig]] = None
 
     @classmethod
     def new(
             cls,
+            *,
             umask: ta.Union[int, str] = 0o22,
             directory: ta.Optional[str] = None,
             logfile: str = 'supervisord.log',

ominfra/supervisor/configs.py

@@ -29,22 +29,124 @@ class RestartUnconditionally:
 
 @dc.dataclass(frozen=True)
 class ProcessConfig:
+    # A Python string expression that is used to compose the supervisor process name for this process. You usually don't
+    # need to worry about setting this unless you change numprocs. The string expression is evaluated against a
+    # dictionary that includes group_name, host_node_name, process_num, program_name, and here (the directory of the
+    # supervisord config file).
     name: str
+
+    # The command that will be run when this program is started. The command can be either absolute (e.g.
+    # /path/to/programname) or relative (e.g. programname). If it is relative, the supervisord's environment $PATH will
+    # be searched for the executable. Programs can accept arguments, e.g. /path/to/program foo bar. The command line can
+    # use double quotes to group arguments with spaces in them to pass to the program, e.g. /path/to/program/name -p
+    # "foo bar". Note that the value of command may include Python string expressions, e.g. /path/to/programname
+    # --port=80%(process_num)02d might expand to /path/to/programname --port=8000 at runtime. String expressions are
+    # evaluated against a dictionary containing the keys group_name, host_node_name, program_name, process_num,
+    # numprocs, here (the directory of the supervisord config file), and all supervisord's environment variables
+    # prefixed with ENV_. Controlled programs should themselves not be daemons, as supervisord assumes it is responsible
+    # for daemonizing its subprocesses
     command: str
 
+    #
+
+    # Supervisor will start as many instances of this program as named by numprocs. Note that if numprocs > 1, the
+    # process_name expression must include %(process_num)s (or any other valid Python string expression that includes
+    # process_num) within it.
+    num_procs: int = 1
+
+    # An integer offset that is used to compute the number at which process_num starts.
+    num_procs_start: int = 0
+
+    #
+
+    # Instruct supervisord to use this UNIX user account as the account which runs the program. The user can only be
+    # switched if supervisord is run as the root user. If supervisord can't switch to the specified user, the program
+    # will not be started.
+    #
+    # Note: The user will be changed using setuid only. This does not start a login shell and does not change
+    # environment variables like USER or HOME
+    user: ta.Optional[str] = None
     uid: ta.Optional[int] = None
-    directory: ta.Optional[str] = None
+
+    # An octal number (e.g. 002, 022) representing the umask of the process.
     umask: ta.Optional[int] = None
+
+    #
+
+    # A file path representing a directory to which supervisord should temporarily chdir before exec'ing the child.
+    directory: ta.Optional[str] = None
+
+    # A list of key/value pairs in the form KEY="val",KEY2="val2" that will be placed in the child process' environment.
+    # The environment string may contain Python string expressions that will be evaluated against a dictionary
+    # 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.
+    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.
     priority: int = 999
 
+    # If true, this program will start automatically when supervisord is started.
     auto_start: bool = True
+
+    # Specifies if supervisord should automatically restart a process if it exits when it is in the RUNNING state. May
+    # be one of false, unexpected, or true. If false, the process will not be autorestarted. If unexpected, the process
+    # will be restarted when the program exits with an exit code that is not one of the exit codes associated with this
+    # process' configuration (see exitcodes). If true, the process will be unconditionally restarted when it exits,
+    # without regard to its exit code.
+    #
+    # Note: autorestart controls whether supervisord will autorestart a program if it exits after it has successfully
+    # started up (the process is in the RUNNING state). supervisord has a different restart mechanism for when the
+    # process is starting up (the process is in the STARTING state). Retries during process startup are controlled by
+    # startsecs and startretries.
     auto_restart: str = 'unexpected'
 
+    # The total number of seconds which the program needs to stay running after a startup to consider the start
+    # 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
+    # failure if the process exits quicker than startsecs.
     start_secs: int = 1
+
+    # The number of serial failure attempts that supervisord will allow when attempting to start the program before
+    # giving up and putting the process into an FATAL state.
+    #
+    # Note: After each failed restart, process will be put in BACKOFF state and each retry attempt will take
+    # increasingly more time.
     start_retries: int = 3
 
-    num_procs: int = 1
-    num_procs_start: int = 0
+    # The signal used to kill the program when a stop is requested. This can be specified using the signal's name or its
+    # number. It is normally one of: TERM, HUP, INT, QUIT, KILL, USR1, or USR2.
+    stop_signal: int = signal.SIGTERM
+
+    # The number of seconds to wait for the OS to return a SIGCHLD to supervisord after the program has been sent a
+    # stopsignal. If this number of seconds elapses before supervisord receives a SIGCHLD from the process, supervisord
+    # will attempt to kill it with a final SIGKILL.
+    stop_wait_secs: int = 10
+
+    # If true, the flag causes supervisor to send the stop signal to the whole process group and implies killasgroup is
+    # true. This is useful for programs, such as Flask in debug mode, that do not propagate stop signals to their
+    # children, leaving them orphaned.
+    stop_as_group: bool = False
+
+    # If true, when resorting to send SIGKILL to the program to terminate it send it to its whole process group instead,
+    # 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
+    # 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.
+    #
+    # Note: In Supervisor versions prior to 4.0, the default was 0,2. In Supervisor 4.0, the default was changed to 0.
+    exitcodes: ta.Sequence[int] = (0,)
+
+    #
 
     @dc.dataclass(frozen=True)
     class Log:
@@ -58,18 +160,14 @@ class ProcessConfig:
     stdout: Log = Log()
     stderr: Log = Log()
 
-    stop_signal: int = signal.SIGTERM
-    stop_wait_secs: int = 10
-    stop_as_group: bool = False
-
-    kill_as_group: bool = False
-
-    exitcodes: ta.Sequence[int] = (0,)
-
+    # If true, cause the process' stderr output to be sent back to supervisord on its stdout file descriptor (in UNIX
+    # shell terms, this is the equivalent of executing /the/program 2>&1).
+    #
+    # Note: Do not set redirect_stderr=true in an [eventlistener:x] section. Eventlisteners use stdout and stdin to
+    # communicate with supervisord. If stderr is redirected, output from stderr will interfere with the eventlistener
+    # protocol.
     redirect_stderr: bool = False
 
-    environment: ta.Optional[ta.Mapping[str, str]] = None
-
 
 @dc.dataclass(frozen=True)
 class ProcessGroupConfig:
@@ -82,28 +180,75 @@ class ProcessGroupConfig:
 
 @dc.dataclass(frozen=True)
 class ServerConfig:
+    # Instruct supervisord to switch users to this UNIX user account before doing any meaningful processing. The user
+    # can only be switched if supervisord is started as the root user.
     user: ta.Optional[str] = None
+
+    # If true, supervisord will start in the foreground instead of daemonizing.
     nodaemon: bool = False
+
+    # The umask of the supervisord process.
     umask: int = 0o22
+
+    #
+
+    # When supervisord daemonizes, switch to this directory. This option can include the value %(here)s, which expands
+    # to the directory in which the supervisord configuration file was found.
     directory: ta.Optional[str] = None
-    logfile: str = 'supervisord.log'
-    logfile_max_bytes: int = 50 * 1024 * 1024
-    logfile_backups: int = 10
-    loglevel: int = logging.INFO
+
+    # The location in which supervisord keeps its pid file. This option can include the value %(here)s, which expands to
+    # the directory in which the supervisord configuration file was found.
     pidfile: str = 'supervisord.pid'
+
+    # The identifier string for this supervisor process, used by the RPC interface.
     identifier: str = 'supervisor'
-    child_logdir: str = '/dev/null'
+
+    # The minimum number of file descriptors that must be available before supervisord will start successfully.
     min_fds: int = 1024
+    # The minimum number of process descriptors that must be available before supervisord will start successfully.
     min_procs: int = 200
+
+    # Prevent supervisord from clearing any existing AUTO child log files at startup time. Useful for debugging
     nocleanup: bool = False
+
+    # Strip all ANSI escape sequences from child log files.
     strip_ansi: bool = False
+
+    #
+
+    # The path to the activity log of the supervisord process. This option can include the value %(here)s, which expands
+    # to the directory in which the supervisord configuration file was found.
+    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.
+    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
+    # kept.
+    logfile_backups: int = 10
+
+    # The logging level, dictating what is written to the supervisord activity log. One of critical, error, warn, info,
+    # debug, trace, or blather. Note that at log level debug, the supervisord log file will record the stderr/stdout
+    # output of its child processes and extended info about process state changes, which is useful for debugging a
+    # process which isn't starting properly.
+    loglevel: int = logging.INFO
+
+    # The directory used for AUTO child log files. This option can include the value %(here)s, which expands to the
+    # directory in which the supervisord configuration file was found.
+    child_logdir: str = '/dev/null'
+
+    # If true and not daemonized, logs will not be directed to stdout.
     silent: bool = False
 
+    #
+
     groups: ta.Optional[ta.Sequence[ProcessGroupConfig]] = None
 
     @classmethod
     def new(
             cls,
+            *,
             umask: ta.Union[int, str] = 0o22,
             directory: ta.Optional[str] = None,
             logfile: str = 'supervisord.log',

{ominfra-0.0.0.dev154.dist-info → ominfra-0.0.0.dev156.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev154
+Version: 0.0.0.dev156
 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.dev154
-Requires-Dist: omlish==0.0.0.dev154
+Requires-Dist: omdev==0.0.0.dev156
+Requires-Dist: omlish==0.0.0.dev156
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev154.dist-info → ominfra-0.0.0.dev156.dist-info}/RECORD

@@ -29,46 +29,57 @@ ominfra/journald/messages.py,sha256=zhAQswhpSBybaBPWONCt0quenYK91HMHRkuOz38mq1E,
 ominfra/journald/tailer.py,sha256=gBVtuc8dm-H13eOYC-F5fCrJLuiC3fAC3TyVdrKhnqQ,33516
 ominfra/manage/__init__.py,sha256=aykrEASTHEtJ-o97jUHRIv8oea41tO7RDHB56cQfmis,265
 ominfra/manage/__main__.py,sha256=5IeIERm-371fSI5ZvPv8eldAJBwgKwpR0R49pTsILNM,76
-ominfra/manage/bootstrap.py,sha256=sEWjTk6PDZOH4R5pQ9QJ_fkK7r5n8j-IRVZ4JAHD-W4,330
-ominfra/manage/bootstrap_.py,sha256=EGp5pK6td-Hj8i7PKdj024K8WY7rZw1voI8Wy0cYKB4,557
+ominfra/manage/bootstrap.py,sha256=1RIRhVkUZjxZcZerHMg8U6xgWhhemGgPN5cDye8dQ68,446
+ominfra/manage/bootstrap_.py,sha256=CYO8HfuVsw02PiVMMnyabL5jqJhexeP0b5mWz8eOtoA,652
 ominfra/manage/config.py,sha256=1y2N_8nXHBZc6YbW6BaRZoDDCTBmiHuWtTOQ7zdr5VE,184
-ominfra/manage/inject.py,sha256=8OSQRHAZClIrg14AtrElBlmBFFuEK64a1BZ8yYUNtG0,1585
-ominfra/manage/main.py,sha256=ccMRt6tp7s9k9Ov36vhAQskhy4WcODimSiUOtLk6oCg,3914
+ominfra/manage/inject.py,sha256=_FVaMZUBKi-oObv14H77luWYCodxNJJD1t4pNQzckFE,2030
+ominfra/manage/main.py,sha256=LrjcdTLUtbEho_LNwQ9JBK2BfE5IZuUF-wSHXujiiuY,3489
 ominfra/manage/marshal.py,sha256=WKj7IU9bo4fBMSSzT6ZMm_WFalXIJZ-V7j8oi92fNhk,305
 ominfra/manage/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/commands/base.py,sha256=LtaI0AgnplttQK7gNncNItq8yuTZQimJTaprVpZktI8,3993
-ominfra/manage/commands/execution.py,sha256=BJyAIOJx7dG8x4T75vIMpE_hEJCPPnfIkebXpQulSNE,618
-ominfra/manage/commands/inject.py,sha256=yyIR0qQaXw_BXEnl8vZZiVkfilZNyyHHbJ44AHTMUi4,3553
-ominfra/manage/commands/interp.py,sha256=OKkenH8YKEW_mEDR6X7_ZLxK9a1Ox6KHSwFPTHT6OzA,1029
+ominfra/manage/commands/inject.py,sha256=uRw6DsllEoL6GDy0dZJdu2z9tf6I7l3YObMli-qIuIo,3426
+ominfra/manage/commands/local.py,sha256=DyHIsQ03_YS6kAA8WLeMyXyGgyizkd1WZUZdATkSsZE,532
 ominfra/manage/commands/marshal.py,sha256=4DSCMPzRiRhufIB_9DPL6LrZkRZOle5ruOWU4MVlcXM,694
-ominfra/manage/commands/subprocess.py,sha256=J0w7WbcTNcyz6IepslkYu_UARUHFGqE-hSW2rpTaEgM,2529
+ominfra/manage/commands/ping.py,sha256=DVZFzL1Z_f-Bq53vxMrL3xOi0iK_nMonJE4KvQf9wsI,546
+ominfra/manage/commands/subprocess.py,sha256=mOZMLp45P87UmRjIStshuSj8STmMma2FvoNomBH4aXE,2453
+ominfra/manage/commands/types.py,sha256=XFZPeqeIBAaIIQF3pdPbGxLlb-LCrz6WtlDWO2q_vz0,210
 ominfra/manage/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ominfra/manage/deploy/apps.py,sha256=i0iB7vVjnsMRahlKn3nTIComQGtYEEWe2twTpRO43Mg,1747
 ominfra/manage/deploy/commands.py,sha256=YZGdpiaqj_-iMp2SMdz4hB6bTKk3UQxnHeTblGyxuuk,560
-ominfra/manage/deploy/inject.py,sha256=5Mi3HmNdLSc2NsTJsa0z0fHzQ9W1eTUVzRD3-t9Sd_8,501
-ominfra/manage/deploy/paths.py,sha256=Ad7OGERMqGUWO-0os1PXSO3sh9uGqrxxlEyT_3fYkac,3703
+ominfra/manage/deploy/config.py,sha256=xBBaeDXmM6omkJHJLMbieKD3wNaxSY1KAaXDiseX7Dk,161
+ominfra/manage/deploy/git.py,sha256=l-LcRIsysK6Y1OIwY2NYhuyzRW6wbE2n2vg9RRnQ2Zs,3815
+ominfra/manage/deploy/inject.py,sha256=0_dBxMsyRYC9VH26Ue9k176IU22t9hWDmw101uIHyNE,1218
+ominfra/manage/deploy/interp.py,sha256=OKkenH8YKEW_mEDR6X7_ZLxK9a1Ox6KHSwFPTHT6OzA,1029
+ominfra/manage/deploy/paths.py,sha256=QZgeqESogfOw02cswGx-UcAwku-iklSjB46xaoDWJxo,5731
+ominfra/manage/deploy/types.py,sha256=zW1nwi_wlBB6ekTmR3udnO2OW-p9JToyh3R27rzNEX8,264
+ominfra/manage/deploy/venvs.py,sha256=CCPa8a5f5YamESDB7KemoLxkfszoczC2swnbAG4eOtY,1763
 ominfra/manage/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/remote/_main.py,sha256=4BAMcbDaNBwhGO3Y5iDgvWk7xMnFooALsF-EbIXO0MI,4360
+ominfra/manage/remote/_main.py,sha256=p5KoiS2WMw6QAqlDl_Zun-JybmCsy8awIfpBMLBjGMY,4356
 ominfra/manage/remote/channel.py,sha256=36xR9Ti9ZA8TUBtxmY0u7_3Lv7E6wzQTxlZl7gLR5GE,2224
-ominfra/manage/remote/config.py,sha256=uazjAYAXyiYOu-i0bxFwQT_hfZPluHHTXbQ5bUYDfvY,523
-ominfra/manage/remote/connection.py,sha256=yIx5eAwX-9dHHTCCVH5uaZiUeJHKVJlJ98_AhJMfgV0,4193
-ominfra/manage/remote/execution.py,sha256=5A12u02LIAs2FitaYGPrNDaVmbwaGCKH-aq3SVBaLHE,11730
-ominfra/manage/remote/inject.py,sha256=A-TwAIbMzs270_zCpngNU1JRsJc42OdbnP55azD4Nvs,1450
+ominfra/manage/remote/config.py,sha256=zRIC7Yhh3FMfoIgyqlbDTwpL_jS23lhQXjGB2_YG4Eg,473
+ominfra/manage/remote/connection.py,sha256=T4fL-GXXAfnbCbkZ3_28t8LAwwki4Td3j41eY_2qKYA,3795
+ominfra/manage/remote/execution.py,sha256=_bygZi_0Uel615uIg43S14CTdmv1unEIu9TPz2mVRJ4,11738
+ominfra/manage/remote/inject.py,sha256=nSNP_VInCCZOWVrUIRHBvLmnM45geFoYmMh-zqc__as,1080
 ominfra/manage/remote/payload.py,sha256=Rn-Yo26POpHEOOfUHX3jWkqcQVEAvkJ_5Bu13jwoob4,944
-ominfra/manage/remote/spawning.py,sha256=bL87ted_lLwLW6DhrYPaXLRaIq7f6VYg_u2LJoMEpoE,3205
+ominfra/manage/remote/spawning.py,sha256=2k1Zfrn8RgnfCxGEaAk5ditpb2BcMARjdiYC_RiERVY,3203
 ominfra/manage/system/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/system/commands.py,sha256=1jzpDdQFiOQ7iXY8c6ooBxG3xT3ZjRmOLlvFIereeqc,670
-ominfra/manage/system/config.py,sha256=sxjJ5dV_x1Ax2tyHvL7KaJYPaDFt9MTORFKdVXb7Y_I,158
-ominfra/manage/system/inject.py,sha256=Q28oFEf6wAGkm-iU521NXp9dvD_0vE5YTQjNBa-AK5I,1412
-ominfra/manage/system/packages.py,sha256=SjAtPBXxtYhS38YTenEOdzuSHEt_sK_zG0FCEYgpNbI,3654
-ominfra/manage/system/types.py,sha256=wLe-HgJ6pHZyueA0gbFNlHVzk5A5T02-O5zD65A65iQ,99
+ominfra/manage/system/commands.py,sha256=XrYvsxiwTJh17buIWmoFGH8zTUIXmrXvYkLy1INtmkU,1173
+ominfra/manage/system/config.py,sha256=mEVBL1cy4twO6F0bdnCI01Sm0xuLe1Z5eiAzCvbmoAc,196
+ominfra/manage/system/inject.py,sha256=Ksc7Xw_Yh3lWwkTRxB2JCeOYO-nMyKj-Kssd1RDkR9g,1871
+ominfra/manage/system/packages.py,sha256=uqCemll529Bg6OvJVkk3m4d3xOe_FFrgBgRQep_-Pv8,4612
+ominfra/manage/system/platforms.py,sha256=F0bgYzUzCjZ2LbWVvnEq2ya_X_LfRW406LQYFL7bG44,1202
+ominfra/manage/targets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ominfra/manage/targets/connection.py,sha256=j2QrVS-QFOZJ47TqwaMt8MSPg0whokysGePagjJg3Jg,4637
+ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
+ominfra/manage/targets/targets.py,sha256=CFl8Uirgn3gfowO1Fn-LBK-6qYqEMFJ9snPUl0gCRuM,1753
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=jLXI4iuMN1uRtRgCeyyczjwRl1pxKEgfbz1q8CJoUjc,149453
-ominfra/scripts/manage.py,sha256=2v-2iIZqSVixsAvj7569_kmhwG14xVVu-9BVur1soh8,206140
-ominfra/scripts/supervisor.py,sha256=uPzXIfstv1J-LhDCKLx70RMUBQVA0zMkd7h4X18SAzQ,262206
+ominfra/scripts/journald2aws.py,sha256=5eqvfZ_qB1wc0WOop3mz82gOHN3SGzFcuwxUeXLOR4I,151695
+ominfra/scripts/manage.py,sha256=eB_u6D3BdulXlyis65K28F0IHSTPLPKsSSTafJ1zuJ4,250371
+ominfra/scripts/supervisor.py,sha256=PrRSYhPe8K6sOAmmF7-LNvCHsSBIizWDkV_GIsPL2vE,272399
 ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
-ominfra/supervisor/configs.py,sha256=OPtiL5_SjBYQ9xDqMgZvjoXgpleTxv4d3C4fD1X2Dz0,3966
+ominfra/supervisor/configs.py,sha256=SFn1_Cm48fqmjYsFCEx_-fvrnOXHPTIXgcRhHtUz7q8,13650
 ominfra/supervisor/dispatchers.py,sha256=zXLwQS4Vc6dWw5o9QOL04UMDt7w6CKu9wf19CjUiS2Q,1005
 ominfra/supervisor/dispatchersimpl.py,sha256=q3dEyOHWTPKm28nmAGisjgIW1BX6O3-SzbYa7nWuTEs,11349
 ominfra/supervisor/events.py,sha256=XGrtzHr1xm0dwjz329fn9eR0_Ap-LQL6Sk8LJ8eVDEo,6692
@@ -106,9 +117,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=h6akQJMl0KuWLHS7Ur6WcBZ2JwF0DJQhsPTnFBdGyNk,3571
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev154.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev154.dist-info/METADATA,sha256=i1gJXGifek_hg_Y9adO9CmVO_ZN0TcAFSFpiLnbgHpE,731
-ominfra-0.0.0.dev154.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ominfra-0.0.0.dev154.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev154.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev154.dist-info/RECORD,,
+ominfra-0.0.0.dev156.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev156.dist-info/METADATA,sha256=Uh8A7yOgSiNjW9yWFY_Vm8fW6j9BVhm8wLX-hZOTbjs,731
+ominfra-0.0.0.dev156.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev156.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev156.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev156.dist-info/RECORD,,

ominfra/manage/system/types.py

@@ -1,5 +0,0 @@
-# ruff: noqa: UP006 UP007
-import typing as ta
-
-
-SystemPlatform = ta.NewType('SystemPlatform', str)