ominfra 0.0.0.dev179__tar.gz → 0.0.0.dev180__tar.gz

{ominfra-0.0.0.dev179/ominfra.egg-info → ominfra-0.0.0.dev180}/PKG-INFO

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

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra/clouds/aws/cli.py

@@ -5,7 +5,7 @@ from . import metadata
 
 
 class Cli(ap.Cli):
-    @ap.command(
+    @ap.cmd(
         ap.arg('key', nargs='*'),
         ap.arg('--url'),
     )

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra/manage/main.py

@@ -14,7 +14,7 @@ import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_command
+from omlish.argparse.cli import argparse_cmd
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.logs import log  # noqa
@@ -55,7 +55,7 @@ class MainCli(ArgparseCli):
 
     #
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('--_payload-file'),
 
         argparse_arg('--pycharm-debug-port', type=int),

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra/manage/remote/spawning.py

@@ -9,7 +9,7 @@ import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
-from omlish.lite.shlex import shlex_maybe_quote
+from omlish.shlex import shlex_maybe_quote
 from omlish.subprocesses import SUBPROCESS_CHANNEL_OPTION_VALUES
 from omlish.subprocesses import SubprocessChannelOption
 

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra/scripts/manage.py

@@ -111,7 +111,7 @@ CommandT = ta.TypeVar('CommandT', bound='Command')
 CommandOutputT = ta.TypeVar('CommandOutputT', bound='Command.Output')
 
 # ../../omlish/argparse/cli.py
-ArgparseCommandFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
 
 # ../../omlish/lite/contextmanagers.py
 ExitStackedT = ta.TypeVar('ExitStackedT', bound='ExitStacked')
@@ -2766,21 +2766,6 @@ def read_package_resource_text(package: str, resource: str) -> str:
     return importlib.resources.read_text(package, resource)
 
 
-########################################
-# ../../../omlish/lite/shlex.py
-
-
-def shlex_needs_quote(s: str) -> bool:
-    return bool(s) and len(list(shlex.shlex(s))) > 1
-
-
-def shlex_maybe_quote(s: str) -> str:
-    if shlex_needs_quote(s):
-        return shlex.quote(s)
-    else:
-        return s
-
-
 ########################################
 # ../../../omlish/lite/strings.py
 
@@ -3580,6 +3565,21 @@ def relative_symlink(
     )
 
 
+########################################
+# ../../../omlish/shlex.py
+
+
+def shlex_needs_quote(s: str) -> bool:
+    return bool(s) and len(list(shlex.shlex(s))) > 1
+
+
+def shlex_maybe_quote(s: str) -> str:
+    if shlex_needs_quote(s):
+        return shlex.quote(s)
+    else:
+        return s
+
+
 ########################################
 # ../../../omdev/packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -4546,15 +4546,15 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
 
 
 @dc.dataclass(eq=False)
-class ArgparseCommand:
+class ArgparseCmd:
     name: str
-    fn: ArgparseCommandFn
+    fn: ArgparseCmdFn
     args: ta.Sequence[ArgparseArg] = ()  # noqa
 
     # _: dc.KW_ONLY
 
     aliases: ta.Optional[ta.Sequence[str]] = None
-    parent: ta.Optional['ArgparseCommand'] = None
+    parent: ta.Optional['ArgparseCmd'] = None
     accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
@@ -4569,7 +4569,7 @@ class ArgparseCommand:
 
         check.arg(callable(self.fn))
         check.arg(all(isinstance(a, ArgparseArg) for a in self.args))
-        check.isinstance(self.parent, (ArgparseCommand, type(None)))
+        check.isinstance(self.parent, (ArgparseCmd, type(None)))
         check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
@@ -4583,21 +4583,21 @@ class ArgparseCommand:
         return self.fn(*args, **kwargs)
 
 
-def argparse_command(
+def argparse_cmd(
         *args: ArgparseArg,
         name: ta.Optional[str] = None,
         aliases: ta.Optional[ta.Iterable[str]] = None,
-        parent: ta.Optional[ArgparseCommand] = None,
+        parent: ta.Optional[ArgparseCmd] = None,
         accepts_unknown: bool = False,
-) -> ta.Any:  # ta.Callable[[ArgparseCommandFn], ArgparseCommand]:  # FIXME
+) -> ta.Any:  # ta.Callable[[ArgparseCmdFn], ArgparseCmd]:  # FIXME
     for arg in args:
         check.isinstance(arg, ArgparseArg)
     check.isinstance(name, (str, type(None)))
-    check.isinstance(parent, (ArgparseCommand, type(None)))
+    check.isinstance(parent, (ArgparseCmd, type(None)))
     check.not_isinstance(aliases, str)
 
     def inner(fn):
-        return ArgparseCommand(
+        return ArgparseCmd(
             (name if name is not None else fn.__name__).replace('_', '-'),
             fn,
             args,
@@ -4652,7 +4652,7 @@ class ArgparseCli:
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
             bseen = set()  # type: ignore
             for k, v in bns.items():
-                if isinstance(v, (ArgparseCommand, ArgparseArg)):
+                if isinstance(v, (ArgparseCmd, ArgparseArg)):
                     check.not_in(v, bseen)
                     bseen.add(v)
                     objs[k] = v
@@ -4679,7 +4679,7 @@ class ArgparseCli:
         subparsers = parser.add_subparsers()
 
         for att, obj in objs.items():
-            if isinstance(obj, ArgparseCommand):
+            if isinstance(obj, ArgparseCmd):
                 if obj.parent is not None:
                     raise NotImplementedError
 
@@ -4741,7 +4741,7 @@ class ArgparseCli:
 
     #
 
-    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
         return cmd.__get__(self, type(self))
 
     def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
@@ -11570,7 +11570,7 @@ class MainCli(ArgparseCli):
 
     #
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('--_payload-file'),
 
         argparse_arg('--pycharm-debug-port', type=int),

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra/scripts/supervisor.py

@@ -113,15 +113,14 @@ CheckOnRaiseFn = ta.Callable[[Exception], None]  # ta.TypeAlias
 CheckExceptionFactory = ta.Callable[..., Exception]  # ta.TypeAlias
 CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
 
-# ../../omlish/lite/socket.py
-SocketAddress = ta.Any
-SocketHandlerFactory = ta.Callable[[SocketAddress, ta.BinaryIO, ta.BinaryIO], 'SocketHandler']
-
 # ../../omlish/lite/typing.py
 A0 = ta.TypeVar('A0')
 A1 = ta.TypeVar('A1')
 A2 = ta.TypeVar('A2')
 
+# ../../omlish/sockets/addresses.py
+SocketAddress = ta.Any
+
 # events.py
 EventCallback = ta.Callable[['Event'], None]
 ProcessOutputChannel = ta.Literal['stdout', 'stderr']  # ta.TypeAlias
@@ -139,6 +138,9 @@ InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
 InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
 InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
 
+# ../../omlish/sockets/handlers.py
+SocketHandlerFactory = ta.Callable[[SocketAddress, ta.BinaryIO, ta.BinaryIO], 'SocketHandler']
+
 # ../configs.py
 ConfigMapping = ta.Mapping[str, ta.Any]
 
@@ -2344,76 +2346,6 @@ def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
         todo.extend(reversed(cur.__subclasses__()))
 
 
-########################################
-# ../../../omlish/lite/socket.py
-"""
-TODO:
- - SocketClientAddress family / tuple pairs
-  + codification of https://docs.python.org/3/library/socket.html#socket-families
-"""
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class SocketAddressInfoArgs:
-    host: ta.Optional[str]
-    port: ta.Union[str, int, None]
-    family: socket.AddressFamily = socket.AddressFamily.AF_UNSPEC
-    type: int = 0
-    proto: int = 0
-    flags: socket.AddressInfo = socket.AddressInfo(0)
-
-
-@dc.dataclass(frozen=True)
-class SocketAddressInfo:
-    family: socket.AddressFamily
-    type: int
-    proto: int
-    canonname: ta.Optional[str]
-    sockaddr: SocketAddress
-
-
-def get_best_socket_family(
-        host: ta.Optional[str],
-        port: ta.Union[str, int, None],
-        family: ta.Union[int, socket.AddressFamily] = socket.AddressFamily.AF_UNSPEC,
-) -> ta.Tuple[socket.AddressFamily, SocketAddress]:
-    """https://github.com/python/cpython/commit/f289084c83190cc72db4a70c58f007ec62e75247"""
-
-    infos = socket.getaddrinfo(
-        host,
-        port,
-        family,
-        type=socket.SOCK_STREAM,
-        flags=socket.AI_PASSIVE,
-    )
-    ai = SocketAddressInfo(*next(iter(infos)))
-    return ai.family, ai.sockaddr
-
-
-##
-
-
-class SocketHandler(abc.ABC):
-    def __init__(
-            self,
-            client_address: SocketAddress,
-            rfile: ta.BinaryIO,
-            wfile: ta.BinaryIO,
-    ) -> None:
-        super().__init__()
-
-        self._client_address = client_address
-        self._rfile = rfile
-        self._wfile = wfile
-
-    @abc.abstractmethod
-    def handle(self) -> None:
-        raise NotImplementedError
-
-
 ########################################
 # ../../../omlish/lite/strings.py
 
@@ -2670,6 +2602,55 @@ class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
         self._underlying.handleError(record)
 
 
+########################################
+# ../../../omlish/sockets/addresses.py
+"""
+TODO:
+ - SocketClientAddress family / tuple pairs
+  + codification of https://docs.python.org/3/library/socket.html#socket-families
+"""
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class SocketAddressInfoArgs:
+    host: ta.Optional[str]
+    port: ta.Union[str, int, None]
+    family: socket.AddressFamily = socket.AddressFamily.AF_UNSPEC
+    type: int = 0
+    proto: int = 0
+    flags: socket.AddressInfo = socket.AddressInfo(0)
+
+
+@dc.dataclass(frozen=True)
+class SocketAddressInfo:
+    family: socket.AddressFamily
+    type: int
+    proto: int
+    canonname: ta.Optional[str]
+    sockaddr: SocketAddress
+
+
+def get_best_socket_family(
+        host: ta.Optional[str],
+        port: ta.Union[str, int, None],
+        family: ta.Union[int, socket.AddressFamily] = socket.AddressFamily.AF_UNSPEC,
+) -> ta.Tuple[socket.AddressFamily, SocketAddress]:
+    """https://github.com/python/cpython/commit/f289084c83190cc72db4a70c58f007ec62e75247"""
+
+    infos = socket.getaddrinfo(
+        host,
+        port,
+        family,
+        type=socket.SOCK_STREAM,
+        flags=socket.AI_PASSIVE,
+    )
+    ai = SocketAddressInfo(*next(iter(infos)))
+    return ai.family, ai.sockaddr
+
+
 ########################################
 # ../events.py
 
@@ -5829,6 +5810,31 @@ def journald_log_handler_factory(
     return logging.StreamHandler()
 
 
+########################################
+# ../../../omlish/sockets/handlers.py
+
+
+##
+
+
+class SocketHandler(abc.ABC):
+    def __init__(
+            self,
+            client_address: SocketAddress,
+            rfile: ta.BinaryIO,
+            wfile: ta.BinaryIO,
+    ) -> None:
+        super().__init__()
+
+        self._client_address = client_address
+        self._rfile = rfile
+        self._wfile = wfile
+
+    @abc.abstractmethod
+    def handle(self) -> None:
+        raise NotImplementedError
+
+
 ########################################
 # ../../configs.py
 

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra/supervisor/http.py

@@ -12,7 +12,7 @@ from omlish.io.fdio.handlers import SocketFdioHandler
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import defer
 from omlish.lite.json import JSON_PRETTY_KWARGS
-from omlish.lite.socket import SocketAddress
+from omlish.sockets.addresses import SocketAddress
 
 from .dispatchers import Dispatchers
 from .groups import ProcessGroupManager

ominfra-0.0.0.dev180/ominfra/systemd.py

@@ -0,0 +1,18 @@
+# @omlish-lite
+import io
+import typing as ta
+
+
+def render_systemd_unit(settings_by_section: ta.Mapping[str, ta.Mapping[str, str]]) -> str:
+    out = io.StringIO()
+
+    for i, (section, settings) in enumerate(settings_by_section.items()):
+        if i:
+            out.write('\n')
+
+        out.write(f'[{section}]\n')
+
+        for k, v in settings.items():
+            out.write(f'{k}={v}\n')
+
+    return out.getvalue()

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra/tailscale/cli.py

@@ -72,7 +72,7 @@ class Cli(ap.Cli):
         else:
             return 'tailscale'
 
-    @ap.command(name='bin')
+    @ap.cmd(name='bin')
     def bin_cmd(self) -> None:
         print(self.bin())
 
@@ -84,7 +84,7 @@ class Cli(ap.Cli):
         ])
         return msh.unmarshal(json.loads(stdout.decode()), CliStatus)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('name', nargs='?'),
         name='status',
     )
@@ -97,14 +97,14 @@ class Cli(ap.Cli):
             out = status
         print(json.dumps_pretty(msh.marshal(out)))
 
-    @ap.command()
+    @ap.cmd()
     def ips(self) -> None:
         print(json.dumps_pretty({
             hn: node.ipv4s
             for hn, node in self.status().nodes_by_host_name.items()
         }))
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('name', nargs='?'),
     )
     def ip(self) -> None:

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ ominfra/cmds.py
 ominfra/configs.py
 ominfra/pyremote.py
 ominfra/ssh.py
+ominfra/systemd.py
 ominfra/threadworkers.py
 ominfra.egg-info/PKG-INFO
 ominfra.egg-info/SOURCES.txt

{ominfra-0.0.0.dev179 → ominfra-0.0.0.dev180}/ominfra.egg-info/requires.txt

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

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