ominfra 0.0.0.dev218__tar.gz → 0.0.0.dev220__tar.gz

{ominfra-0.0.0.dev218/ominfra.egg-info → ominfra-0.0.0.dev220}/PKG-INFO

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

{ominfra-0.0.0.dev218 → ominfra-0.0.0.dev220}/ominfra/clouds/aws/instancetypes/cli.py

@@ -5,9 +5,9 @@ import typing as ta
 
 from omdev.secrets import load_secrets
 from omlish import lang
-from omlish import secrets as sec
 from omlish.argparse import all as ap
 from omlish.formats import json
+from omlish.secrets import all as sec
 
 from .cache import load_instance_types
 

{ominfra-0.0.0.dev218 → ominfra-0.0.0.dev220}/ominfra/scripts/supervisor.py

@@ -71,6 +71,7 @@ import select
 import shlex
 import signal
 import socket
+import socket as socket_
 import stat
 import string
 import sys
@@ -2820,15 +2821,15 @@ TODO:
 class SocketAddressInfoArgs:
     host: ta.Optional[str]
     port: ta.Union[str, int, None]
-    family: socket.AddressFamily = socket.AddressFamily.AF_UNSPEC
+    family: socket_.AddressFamily = socket_.AddressFamily.AF_UNSPEC
     type: int = 0
     proto: int = 0
-    flags: socket.AddressInfo = socket.AddressInfo(0)
+    flags: socket_.AddressInfo = socket_.AddressInfo(0)
 
 
 @dc.dataclass(frozen=True)
 class SocketAddressInfo:
-    family: socket.AddressFamily
+    family: socket_.AddressFamily
     type: int
     proto: int
     canonname: ta.Optional[str]
@@ -2836,32 +2837,44 @@ class SocketAddressInfo:
 
 
 class SocketFamilyAndAddress(ta.NamedTuple):
-    family: socket.AddressFamily
+    family: socket_.AddressFamily
     address: 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,
+        family: ta.Union[int, socket_.AddressFamily] = socket_.AddressFamily.AF_UNSPEC,
 ) -> SocketFamilyAndAddress:
     """https://github.com/python/cpython/commit/f289084c83190cc72db4a70c58f007ec62e75247"""
 
-    infos = socket.getaddrinfo(
+    infos = socket_.getaddrinfo(
         host,
         port,
         family,
-        type=socket.SOCK_STREAM,
-        flags=socket.AI_PASSIVE,
+        type=socket_.SOCK_STREAM,
+        flags=socket_.AI_PASSIVE,
     )
     ai = SocketAddressInfo(*next(iter(infos)))
     return SocketFamilyAndAddress(ai.family, ai.sockaddr)
 
 
 class SocketAndAddress(ta.NamedTuple):
-    socket: socket.socket
+    socket: socket_.socket
     address: SocketAddress
 
+    def wrap_socket(self, fn: ta.Callable[[socket_.socket], socket_.socket]):
+        return self._replace(socket=fn(self.socket))
+
+    @classmethod
+    def socket_wrapper(
+            cls,
+            fn: ta.Callable[[socket_.socket], socket_.socket],
+    ) -> ta.Callable[['SocketAndAddress'], 'SocketAndAddress']:
+        def inner(conn):
+            return conn.wrap_socket(fn)
+        return inner
+
 
 ########################################
 # ../../../omlish/sockets/io.py
@@ -6391,6 +6404,12 @@ def journald_log_handler_factory(
 ##
 
 
+class SocketHandler_(abc.ABC):  # noqa
+    @abc.abstractmethod
+    def __call__(self, addr: SocketAddress, f: SocketIoPair) -> None:
+        raise NotImplementedError
+
+
 ########################################
 # ../configs.py
 
@@ -6831,12 +6850,20 @@ class HttpHandlerResponse:
     data: ta.Optional[HttpHandlerResponseData] = None
     close_connection: ta.Optional[bool] = None
 
+    def close(self) -> None:
+        if isinstance(d := self.data, HttpHandlerResponseStreamedData):
+            d.close()
+
 
 @dc.dataclass(frozen=True)
 class HttpHandlerResponseStreamedData:
     iter: ta.Iterable[bytes]
     length: ta.Optional[int] = None
 
+    def close(self) -> None:
+        if hasattr(d := self.iter, 'close'):
+            d.close()  # noqa
+
 
 class HttpHandlerError(Exception):
     pass
@@ -6846,6 +6873,12 @@ class UnsupportedMethodHttpHandlerError(Exception):
     pass
 
 
+class HttpHandler_(abc.ABC):  # noqa
+    @abc.abstractmethod
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+        raise NotImplementedError
+
+
 ########################################
 # ../../../omlish/lite/configs.py
 
@@ -7358,6 +7391,10 @@ class CoroHttpServer:
                     return h
             return None
 
+        def close(self) -> None:
+            if isinstance(d := self.data, HttpHandlerResponseStreamedData):
+                d.close()
+
     #
 
     def _build_response_head_bytes(self, a: _Response) -> bytes:
@@ -7573,35 +7610,45 @@ class CoroHttpServer:
         while True:
             gen = self.coro_handle_one()
 
-            o = next(gen)
             i: ta.Optional[bytes]
+            o: ta.Any = next(gen)
             while True:
-                if isinstance(o, self.AnyLogIo):
-                    i = None
-                    yield o
+                try:
+                    if isinstance(o, self.AnyLogIo):
+                        i = None
+                        yield o
 
-                elif isinstance(o, self.AnyReadIo):
-                    i = check.isinstance((yield o), bytes)
+                    elif isinstance(o, self.AnyReadIo):
+                        i = check.isinstance((yield o), bytes)
 
-                elif isinstance(o, self._Response):
-                    i = None
+                    elif isinstance(o, self._Response):
+                        i = None
 
-                    r = self._preprocess_response(o)
-                    hb = self._build_response_head_bytes(r)
-                    check.none((yield self.WriteIo(hb)))
+                        r = self._preprocess_response(o)
+                        hb = self._build_response_head_bytes(r)
+                        check.none((yield self.WriteIo(hb)))
 
-                    for b in self._yield_response_data(r):
-                        yield self.WriteIo(b)
+                        for b in self._yield_response_data(r):
+                            yield self.WriteIo(b)
 
-                else:
-                    raise TypeError(o)
+                        o.close()
+                        o = None
 
-                try:
-                    o = gen.send(i)
-                except EOFError:
-                    return
-                except StopIteration:
-                    break
+                    else:
+                        raise TypeError(o)  # noqa
+
+                    try:
+                        o = gen.send(i)
+                    except EOFError:
+                        return
+                    except StopIteration:
+                        break
+
+                except Exception:  # noqa
+                    if hasattr(o, 'close'):
+                        o.close()
+
+                    raise
 
     def coro_handle_one(self) -> ta.Generator[
         ta.Union[AnyLogIo, AnyReadIo, _Response],
@@ -7683,34 +7730,40 @@ class CoroHttpServer:
             yield self._build_error_response(err)
             return
 
-        # Build internal response
+        try:
+            # Build internal response
 
-        response_headers = handler_response.headers or {}
-        response_data = handler_response.data
+            response_headers = handler_response.headers or {}
+            response_data = handler_response.data
 
-        headers: ta.List[CoroHttpServer._Header] = [
-            *self._make_default_headers(),
-        ]
+            headers: ta.List[CoroHttpServer._Header] = [
+                *self._make_default_headers(),
+            ]
 
-        for k, v in response_headers.items():
-            headers.append(self._Header(k, v))
+            for k, v in response_headers.items():
+                headers.append(self._Header(k, v))
 
-        if handler_response.close_connection and 'Connection' not in headers:
-            headers.append(self._Header('Connection', 'close'))
+            if handler_response.close_connection and 'Connection' not in headers:
+                headers.append(self._Header('Connection', 'close'))
 
-        yield self._Response(
-            version=parsed.version,
-            code=http.HTTPStatus(handler_response.status),
-            headers=headers,
-            data=response_data,
-            close_connection=handler_response.close_connection,
-        )
+            yield self._Response(
+                version=parsed.version,
+                code=http.HTTPStatus(handler_response.status),
+                headers=headers,
+                data=response_data,
+                close_connection=handler_response.close_connection,
+            )
+
+        except Exception:  # noqa
+            handler_response.close()
+
+            raise
 
 
 ##
 
 
-class CoroHttpServerSocketHandler:  # SocketHandler
+class CoroHttpServerSocketHandler(SocketHandler_):
     def __init__(
             self,
             server_factory: CoroHttpServerFactory,

{ominfra-0.0.0.dev218 → ominfra-0.0.0.dev220}/ominfra/tools/listresources.py

@@ -19,7 +19,7 @@ from omdev.secrets import load_secrets
 from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
-from omlish import secrets as sec
+from omlish.secrets import all as sec
 
 
 ##

{ominfra-0.0.0.dev218 → ominfra-0.0.0.dev220/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev218 → ominfra-0.0.0.dev220}/ominfra.egg-info/requires.txt

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

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