ominfra 0.0.0.dev222__tar.gz → 0.0.0.dev223__tar.gz

{ominfra-0.0.0.dev222/ominfra.egg-info → ominfra-0.0.0.dev223}/PKG-INFO

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

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223}/ominfra/scripts/journald2aws.py

@@ -3388,18 +3388,34 @@ class ObjMarshalerManager:
                 return reg
 
             if abc.ABC in ty.__bases__:
-                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}
+                tn = ty.__name__
+                impls: ta.List[ta.Tuple[type, str]] = [  # type: ignore[var-annotated]
+                    (ity, ity.__name__)
+                    for ity in deep_subclasses(ty)
+                    if abc.ABC not in ity.__bases__
+                ]
+
+                if all(itn.endswith(tn) for _, itn in impls):
+                    impls = [
+                        (ity, snake_case(itn[:-len(tn)]))
+                        for ity, itn in impls
+                    ]
+
+                dupe_tns = sorted(
+                    dn
+                    for dn, dc in collections.Counter(itn for _, itn in impls).items()
+                    if dc > 1
+                )
+                if dupe_tns:
+                    raise KeyError(f'Duplicate impl names for {ty}: {dupe_tns}')
+
                 return PolymorphicObjMarshaler.of([
                     PolymorphicObjMarshaler.Impl(
                         ity,
                         itn,
                         rec(ity),
                     )
-                    for ity, itn in ins.items()
+                    for ity, itn in impls
                 ])
 
             if issubclass(ty, enum.Enum):
@@ -4470,7 +4486,51 @@ class BaseSubprocesses(abc.ABC):  # noqa
 ##
 
 
+@dc.dataclass(frozen=True)
+class SubprocessRun:
+    cmd: ta.Sequence[str]
+    input: ta.Any = None
+    timeout: ta.Optional[float] = None
+    check: bool = False
+    capture_output: ta.Optional[bool] = None
+    kwargs: ta.Optional[ta.Mapping[str, ta.Any]] = None
+
+
+@dc.dataclass(frozen=True)
+class SubprocessRunOutput(ta.Generic[T]):
+    proc: T
+
+    returncode: int  # noqa
+
+    stdout: ta.Optional[bytes] = None
+    stderr: ta.Optional[bytes] = None
+
+
 class AbstractSubprocesses(BaseSubprocesses, abc.ABC):
+    @abc.abstractmethod
+    def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+        raise NotImplementedError
+
+    def run(
+            self,
+            *cmd: str,
+            input: ta.Any = None,  # noqa
+            timeout: ta.Optional[float] = None,
+            check: bool = False,
+            capture_output: ta.Optional[bool] = None,
+            **kwargs: ta.Any,
+    ) -> SubprocessRunOutput:
+        return self.run_(SubprocessRun(
+            cmd=cmd,
+            input=input,
+            timeout=timeout,
+            check=check,
+            capture_output=capture_output,
+            kwargs=kwargs,
+        ))
+
+    #
+
     @abc.abstractmethod
     def check_call(
             self,
@@ -4534,6 +4594,25 @@ class AbstractSubprocesses(BaseSubprocesses, abc.ABC):
 
 
 class Subprocesses(AbstractSubprocesses):
+    def run_(self, run: SubprocessRun) -> SubprocessRunOutput[subprocess.CompletedProcess]:
+        proc = subprocess.run(
+            run.cmd,
+            input=run.input,
+            timeout=run.timeout,
+            check=run.check,
+            capture_output=run.capture_output or False,
+            **(run.kwargs or {}),
+        )
+
+        return SubprocessRunOutput(
+            proc=proc,
+
+            returncode=proc.returncode,
+
+            stdout=proc.stdout,  # noqa
+            stderr=proc.stderr,  # noqa
+        )
+
     def check_call(
             self,
             *cmd: str,
@@ -4559,6 +4638,30 @@ subprocesses = Subprocesses()
 
 
 class AbstractAsyncSubprocesses(BaseSubprocesses):
+    @abc.abstractmethod
+    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+        raise NotImplementedError
+
+    def run(
+            self,
+            *cmd: str,
+            input: ta.Any = None,  # noqa
+            timeout: ta.Optional[float] = None,
+            check: bool = False,
+            capture_output: ta.Optional[bool] = None,
+            **kwargs: ta.Any,
+    ) -> ta.Awaitable[SubprocessRunOutput]:
+        return self.run_(SubprocessRun(
+            cmd=cmd,
+            input=input,
+            timeout=timeout,
+            check=check,
+            capture_output=capture_output,
+            kwargs=kwargs,
+        ))
+
+    #
+
     @abc.abstractmethod
     async def check_call(
             self,

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223}/ominfra/scripts/manage.py

@@ -6826,18 +6826,34 @@ class ObjMarshalerManager:
                 return reg
 
             if abc.ABC in ty.__bases__:
-                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}
+                tn = ty.__name__
+                impls: ta.List[ta.Tuple[type, str]] = [  # type: ignore[var-annotated]
+                    (ity, ity.__name__)
+                    for ity in deep_subclasses(ty)
+                    if abc.ABC not in ity.__bases__
+                ]
+
+                if all(itn.endswith(tn) for _, itn in impls):
+                    impls = [
+                        (ity, snake_case(itn[:-len(tn)]))
+                        for ity, itn in impls
+                    ]
+
+                dupe_tns = sorted(
+                    dn
+                    for dn, dc in collections.Counter(itn for _, itn in impls).items()
+                    if dc > 1
+                )
+                if dupe_tns:
+                    raise KeyError(f'Duplicate impl names for {ty}: {dupe_tns}')
+
                 return PolymorphicObjMarshaler.of([
                     PolymorphicObjMarshaler.Impl(
                         ity,
                         itn,
                         rec(ity),
                     )
-                    for ity, itn in ins.items()
+                    for ity, itn in impls
                 ])
 
             if issubclass(ty, enum.Enum):
@@ -8407,7 +8423,51 @@ class BaseSubprocesses(abc.ABC):  # noqa
 ##
 
 
+@dc.dataclass(frozen=True)
+class SubprocessRun:
+    cmd: ta.Sequence[str]
+    input: ta.Any = None
+    timeout: ta.Optional[float] = None
+    check: bool = False
+    capture_output: ta.Optional[bool] = None
+    kwargs: ta.Optional[ta.Mapping[str, ta.Any]] = None
+
+
+@dc.dataclass(frozen=True)
+class SubprocessRunOutput(ta.Generic[T]):
+    proc: T
+
+    returncode: int  # noqa
+
+    stdout: ta.Optional[bytes] = None
+    stderr: ta.Optional[bytes] = None
+
+
 class AbstractSubprocesses(BaseSubprocesses, abc.ABC):
+    @abc.abstractmethod
+    def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+        raise NotImplementedError
+
+    def run(
+            self,
+            *cmd: str,
+            input: ta.Any = None,  # noqa
+            timeout: ta.Optional[float] = None,
+            check: bool = False,
+            capture_output: ta.Optional[bool] = None,
+            **kwargs: ta.Any,
+    ) -> SubprocessRunOutput:
+        return self.run_(SubprocessRun(
+            cmd=cmd,
+            input=input,
+            timeout=timeout,
+            check=check,
+            capture_output=capture_output,
+            kwargs=kwargs,
+        ))
+
+    #
+
     @abc.abstractmethod
     def check_call(
             self,
@@ -8471,6 +8531,25 @@ class AbstractSubprocesses(BaseSubprocesses, abc.ABC):
 
 
 class Subprocesses(AbstractSubprocesses):
+    def run_(self, run: SubprocessRun) -> SubprocessRunOutput[subprocess.CompletedProcess]:
+        proc = subprocess.run(
+            run.cmd,
+            input=run.input,
+            timeout=run.timeout,
+            check=run.check,
+            capture_output=run.capture_output or False,
+            **(run.kwargs or {}),
+        )
+
+        return SubprocessRunOutput(
+            proc=proc,
+
+            returncode=proc.returncode,
+
+            stdout=proc.stdout,  # noqa
+            stderr=proc.stderr,  # noqa
+        )
+
     def check_call(
             self,
             *cmd: str,
@@ -8496,6 +8575,30 @@ subprocesses = Subprocesses()
 
 
 class AbstractAsyncSubprocesses(BaseSubprocesses):
+    @abc.abstractmethod
+    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+        raise NotImplementedError
+
+    def run(
+            self,
+            *cmd: str,
+            input: ta.Any = None,  # noqa
+            timeout: ta.Optional[float] = None,
+            check: bool = False,
+            capture_output: ta.Optional[bool] = None,
+            **kwargs: ta.Any,
+    ) -> ta.Awaitable[SubprocessRunOutput]:
+        return self.run_(SubprocessRun(
+            cmd=cmd,
+            input=input,
+            timeout=timeout,
+            check=check,
+            capture_output=capture_output,
+            kwargs=kwargs,
+        ))
+
+    #
+
     @abc.abstractmethod
     async def check_call(
             self,
@@ -9617,41 +9720,32 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
 
     #
 
-    @dc.dataclass(frozen=True)
-    class RunOutput:
-        proc: asyncio.subprocess.Process
-        stdout: ta.Optional[bytes]
-        stderr: ta.Optional[bytes]
+    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput[asyncio.subprocess.Process]:
+        kwargs = dict(run.kwargs or {})
 
-    async def run(
-            self,
-            *cmd: str,
-            input: ta.Any = None,  # noqa
-            timeout: ta.Optional[float] = None,
-            check: bool = False,  # noqa
-            capture_output: ta.Optional[bool] = None,
-            **kwargs: ta.Any,
-    ) -> RunOutput:
-        if capture_output:
+        if run.capture_output:
             kwargs.setdefault('stdout', subprocess.PIPE)
             kwargs.setdefault('stderr', subprocess.PIPE)
 
         proc: asyncio.subprocess.Process
-        async with self.popen(*cmd, **kwargs) as proc:
-            stdout, stderr = await self.communicate(proc, input, timeout)
+        async with self.popen(*run.cmd, **kwargs) as proc:
+            stdout, stderr = await self.communicate(proc, run.input, run.timeout)
 
         if check and proc.returncode:
             raise subprocess.CalledProcessError(
                 proc.returncode,
-                cmd,
+                run.cmd,
                 output=stdout,
                 stderr=stderr,
             )
 
-        return self.RunOutput(
-            proc,
-            stdout,
-            stderr,
+        return SubprocessRunOutput(
+            proc=proc,
+
+            returncode=check.isinstance(proc.returncode, int),
+
+            stdout=stdout,
+            stderr=stderr,
         )
 
     #

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223}/ominfra/scripts/supervisor.py

@@ -599,7 +599,7 @@ class SuffixMultiplier:
         for k in d:
             if self._keysz is None:
                 self._keysz = len(k)
-            elif self._keysz != len(k):  # type: ignore
+            elif self._keysz != len(k):
                 raise ValueError(k)
 
     def __call__(self, v: ta.Union[str, int]) -> int:
@@ -3929,6 +3929,8 @@ class HttpRequestParser:
 
     #
 
+    _TLS_HANDSHAKE_PREFIX = b'\x16'
+
     def coro_parse(self) -> ta.Generator[int, bytes, ParseHttpRequestResult]:
         raw_request_line = yield self._max_line + 1
 
@@ -3967,6 +3969,17 @@ class HttpRequestParser:
         if not raw_request_line:
             return EmptyParsedHttpResult(**result_kwargs())
 
+        # Detect TLS
+
+        if raw_request_line.startswith(self._TLS_HANDSHAKE_PREFIX):
+            return ParseHttpRequestError(
+                code=http.HTTPStatus.BAD_REQUEST,
+                message='Bad request version (probable TLS handshake)',
+                **result_kwargs(),
+            )
+
+        # Decode line
+
         request_line = raw_request_line.decode('iso-8859-1').rstrip('\r\n')
 
         # Split words
@@ -5984,18 +5997,34 @@ class ObjMarshalerManager:
                 return reg
 
             if abc.ABC in ty.__bases__:
-                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}
+                tn = ty.__name__
+                impls: ta.List[ta.Tuple[type, str]] = [  # type: ignore[var-annotated]
+                    (ity, ity.__name__)
+                    for ity in deep_subclasses(ty)
+                    if abc.ABC not in ity.__bases__
+                ]
+
+                if all(itn.endswith(tn) for _, itn in impls):
+                    impls = [
+                        (ity, snake_case(itn[:-len(tn)]))
+                        for ity, itn in impls
+                    ]
+
+                dupe_tns = sorted(
+                    dn
+                    for dn, dc in collections.Counter(itn for _, itn in impls).items()
+                    if dc > 1
+                )
+                if dupe_tns:
+                    raise KeyError(f'Duplicate impl names for {ty}: {dupe_tns}')
+
                 return PolymorphicObjMarshaler.of([
                     PolymorphicObjMarshaler.Impl(
                         ity,
                         itn,
                         rec(ity),
                     )
-                    for ity, itn in ins.items()
+                    for ity, itn in impls
                 ])
 
             if issubclass(ty, enum.Enum):
@@ -6879,6 +6908,19 @@ class HttpHandler_(abc.ABC):  # noqa
         raise NotImplementedError
 
 
+@dc.dataclass(frozen=True)
+class LoggingHttpHandler(HttpHandler_):
+    handler: HttpHandler
+    log: logging.Logger
+    level: int = logging.INFO
+
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+        self.log.log(self.level, '%r', req)
+        resp = self.handler(req)
+        self.log.log(self.level, '%r', resp)
+        return resp
+
+
 ########################################
 # ../../../omlish/lite/configs.py
 
@@ -7682,7 +7724,7 @@ class CoroHttpServer:
         if isinstance(parsed, ParseHttpRequestError):
             err = self._build_error(
                 parsed.code,
-                *parsed.message,
+                *([parsed.message] if isinstance(parsed.message, str) else parsed.message),
                 version=parsed.version,
             )
             yield self.ErrorLogIo(err)
@@ -8544,7 +8586,7 @@ class CoroHttpServerConnectionFdioHandler(SocketFdioHandler):
         self._log_handler = log_handler
 
         self._read_buf = ReadableListBuffer()
-        self._write_buf: IncrementalWriteBuffer | None = None
+        self._write_buf: ta.Optional[IncrementalWriteBuffer] = None
 
         self._coro_srv = CoroHttpServer(
             addr,
@@ -8552,7 +8594,7 @@ class CoroHttpServerConnectionFdioHandler(SocketFdioHandler):
         )
         self._srv_coro: ta.Optional[ta.Generator[CoroHttpServer.Io, ta.Optional[bytes], None]] = self._coro_srv.coro_handle()  # noqa
 
-        self._cur_io: CoroHttpServer.Io | None = None
+        self._cur_io: ta.Optional[CoroHttpServer.Io] = None
         self._next_io()
 
     #
@@ -8560,7 +8602,7 @@ class CoroHttpServerConnectionFdioHandler(SocketFdioHandler):
     def _next_io(self) -> None:  # noqa
         coro = check.not_none(self._srv_coro)
 
-        d: bytes | None = None
+        d: ta.Optional[bytes] = None
         o = self._cur_io
         while True:
             if o is None:
@@ -8937,7 +8979,7 @@ class HttpServer(HasDispatchers):
 ##
 
 
-class SupervisorHttpHandler:
+class SupervisorHttpHandler(HttpHandler_):
     def __init__(
             self,
             *,
@@ -8947,7 +8989,7 @@ class SupervisorHttpHandler:
 
         self._groups = groups
 
-    def handle(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
         dct = {
             'method': req.method,
             'path': req.path,
@@ -10163,7 +10205,7 @@ def bind_server(
 
     if config.http_port is not None:
         def _provide_http_handler(s: SupervisorHttpHandler) -> HttpServer.Handler:
-            return HttpServer.Handler(s.handle)
+            return HttpServer.Handler(s)
 
         lst.extend([
             inj.bind(HttpServer, singleton=True, eager=True),

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223}/ominfra/supervisor/http.py

@@ -6,6 +6,7 @@ import typing as ta
 
 from omlish.http.coro.fdio import CoroHttpServerConnectionFdioHandler
 from omlish.http.handlers import HttpHandler
+from omlish.http.handlers import HttpHandler_
 from omlish.http.handlers import HttpHandlerRequest
 from omlish.http.handlers import HttpHandlerResponse
 from omlish.io.fdio.handlers import SocketFdioHandler
@@ -98,7 +99,7 @@ class HttpServer(HasDispatchers):
 ##
 
 
-class SupervisorHttpHandler:
+class SupervisorHttpHandler(HttpHandler_):
     def __init__(
             self,
             *,
@@ -108,7 +109,7 @@ class SupervisorHttpHandler:
 
         self._groups = groups
 
-    def handle(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
         dct = {
             'method': req.method,
             'path': req.path,

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223}/ominfra/supervisor/inject.py

@@ -133,7 +133,7 @@ def bind_server(
 
     if config.http_port is not None:
         def _provide_http_handler(s: SupervisorHttpHandler) -> HttpServer.Handler:
-            return HttpServer.Handler(s.handle)
+            return HttpServer.Handler(s)
 
         lst.extend([
             inj.bind(HttpServer, singleton=True, eager=True),

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223}/ominfra/supervisor/utils/strings.py

@@ -73,7 +73,7 @@ class SuffixMultiplier:
         for k in d:
             if self._keysz is None:
                 self._keysz = len(k)
-            elif self._keysz != len(k):  # type: ignore
+            elif self._keysz != len(k):
                 raise ValueError(k)
 
     def __call__(self, v: ta.Union[str, int]) -> int:

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev222 → ominfra-0.0.0.dev223}/ominfra.egg-info/requires.txt

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

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