ominfra 0.0.0.dev219__py3-none-any.whl → 0.0.0.dev220__py3-none-any.whl

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:
@@ -7598,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],
@@ -7708,28 +7730,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.dist-info → ominfra-0.0.0.dev220.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev219
+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.dev219
-Requires-Dist: omlish==0.0.0.dev219
+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.dev219.dist-info → ominfra-0.0.0.dev220.dist-info}/RECORD

@@ -114,7 +114,7 @@ ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=CM1nZMpecXJpcg7icJUCJ-_DX-7CduQurxZQ7EmhQmA,171450
 ominfra/scripts/manage.py,sha256=MaUur1_dDdMHt5YnE6Waxa_v70kydHzKCBHXAuTmKd0,362827
-ominfra/scripts/supervisor.py,sha256=W_8YHq0Cf5AF88_MBwnZVodxXdQ5AE0zAeafvYMRYFg,295380
+ominfra/scripts/supervisor.py,sha256=7rHuykKUftnClZnwIE3V75k7ESEt4u1Y6l5qo_ifI6E,296250
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=BxFoxtyF2aVEcW67ZD9QujoBkJBtvIxGmKqXvLwnEHo,6180
-ominfra-0.0.0.dev219.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev219.dist-info/METADATA,sha256=E0e_wKkjHZleJ28wnBhOjkR8ooXakDMT7XoBxkebkto,731
-ominfra-0.0.0.dev219.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ominfra-0.0.0.dev219.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev219.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev219.dist-info/RECORD,,
+ominfra-0.0.0.dev220.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev220.dist-info/METADATA,sha256=ZGFJV5Q1uT6rEdQR9oMzSmL3uuJARCDlM2QeJJ0n_vI,731
+ominfra-0.0.0.dev220.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ominfra-0.0.0.dev220.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev220.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev220.dist-info/RECORD,,