ominfra 0.0.0.dev219__tar.gz → 0.0.0.dev221__tar.gz

{ominfra-0.0.0.dev219/ominfra.egg-info → ominfra-0.0.0.dev221}/PKG-INFO

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

{ominfra-0.0.0.dev219 → ominfra-0.0.0.dev221}/ominfra/clouds/aws/models/gen/gen.py

@@ -10,8 +10,8 @@ import keyword
 import typing as ta
 
 from omlish import check
-from omlish import collections as col
 from omlish import lang
+from omlish.algorithm import all as alg
 
 
 if ta.TYPE_CHECKING:
@@ -134,7 +134,7 @@ class ModelGen:
             dct[shape.name] = deps
             todo.update(deps - seen)
 
-        return list(lang.flatten(sorted(s - cls.BASE_SHAPE_NAMES) for s in col.mut_toposort(dct)))
+        return list(lang.flatten(sorted(s - cls.BASE_SHAPE_NAMES) for s in alg.mut_toposort(dct)))
 
     #
 

{ominfra-0.0.0.dev219 → ominfra-0.0.0.dev221}/ominfra/scripts/supervisor.py

@@ -6850,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
@@ -7383,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:
@@ -7595,12 +7607,20 @@ class CoroHttpServer:
     #
 
     def coro_handle(self) -> ta.Generator[Io, ta.Optional[bytes], None]:
-        while True:
-            gen = self.coro_handle_one()
+        return self._coro_run_handler(self._coro_handle_one())
 
-            o = next(gen)
-            i: ta.Optional[bytes]
-            while True:
+    def _coro_run_handler(
+            self,
+            gen: ta.Generator[
+                ta.Union[AnyLogIo, AnyReadIo, _Response],
+                ta.Optional[bytes],
+                None,
+            ],
+    ) -> ta.Generator[Io, ta.Optional[bytes], None]:
+        i: ta.Optional[bytes]
+        o: ta.Any = next(gen)
+        while True:
+            try:
                 if isinstance(o, self.AnyLogIo):
                     i = None
                     yield o
@@ -7618,8 +7638,13 @@ class CoroHttpServer:
                     for b in self._yield_response_data(r):
                         yield self.WriteIo(b)
 
+                    o.close()
+                    if o.close_connection:
+                        break
+                    o = None
+
                 else:
-                    raise TypeError(o)
+                    raise TypeError(o)  # noqa
 
                 try:
                     o = gen.send(i)
@@ -7628,7 +7653,13 @@ class CoroHttpServer:
                 except StopIteration:
                     break
 
-    def coro_handle_one(self) -> ta.Generator[
+            except Exception:  # noqa
+                if hasattr(o, 'close'):
+                    o.close()
+
+                raise
+
+    def _coro_handle_one(self) -> ta.Generator[
         ta.Union[AnyLogIo, AnyReadIo, _Response],
         ta.Optional[bytes],
         None,
@@ -7708,28 +7739,34 @@ 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
 
 
 ##

{ominfra-0.0.0.dev219 → ominfra-0.0.0.dev221/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev219 → ominfra-0.0.0.dev221}/ominfra.egg-info/requires.txt

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

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