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

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/scripts/supervisor.py

@@ -7607,50 +7607,59 @@ 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())
 
-            i: ta.Optional[bytes]
-            o: ta.Any = next(gen)
-            while True:
-                try:
-                    if isinstance(o, self.AnyLogIo):
-                        i = None
-                        yield o
+    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
 
-                    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)
 
-                        o.close()
-                        o = None
+                    o.close()
+                    if o.close_connection:
+                        break
+                    o = None
 
-                    else:
-                        raise TypeError(o)  # noqa
+                else:
+                    raise TypeError(o)  # noqa
 
-                    try:
-                        o = gen.send(i)
-                    except EOFError:
-                        return
-                    except StopIteration:
-                        break
+                try:
+                    o = gen.send(i)
+                except EOFError:
+                    return
+                except StopIteration:
+                    break
 
-                except Exception:  # noqa
-                    if hasattr(o, 'close'):
-                        o.close()
+            except Exception:  # noqa
+                if hasattr(o, 'close'):
+                    o.close()
 
-                    raise
+                raise
 
-    def coro_handle_one(self) -> ta.Generator[
+    def _coro_handle_one(self) -> ta.Generator[
         ta.Union[AnyLogIo, AnyReadIo, _Response],
         ta.Optional[bytes],
         None,

{ominfra-0.0.0.dev220.dist-info → ominfra-0.0.0.dev221.dist-info}/METADATA

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

@@ -28,7 +28,7 @@ ominfra/clouds/aws/models/base.py,sha256=0VtlcRo4kbjdIOqikTe_cegViBHqb-DoqJSw_8e
 ominfra/clouds/aws/models/gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/models/gen/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
 ominfra/clouds/aws/models/gen/cli.py,sha256=-tsjPPqUvXVqD40grn1Of-2-YF53dvCfISrIRI2AX4s,3869
-ominfra/clouds/aws/models/gen/gen.py,sha256=u4pfQCH9ir04zd3OPTeb6U3QaOuthM9FsCrJwMDCZB8,15189
+ominfra/clouds/aws/models/gen/gen.py,sha256=b43N1-fId-yA5wwZFJj152NP9jWNPIwX9jQDAHYZbC0,15191
 ominfra/clouds/aws/models/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/models/services/ec2.py,sha256=oktq6_-Tcmziq1fF0NQG5NDQ7kS_PUCr6ldpOKlDm28,262371
 ominfra/clouds/aws/models/services/lambda_.py,sha256=LeAw6TmUwMLjB5VEYH1khWSmlSe6o_YhYjo7l2DXLFY,25766
@@ -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=7rHuykKUftnClZnwIE3V75k7ESEt4u1Y6l5qo_ifI6E,296250
+ominfra/scripts/supervisor.py,sha256=qJzm4unCi4SbTWXj-LpLHNp2CHZX4T_vj5vITM5pNT0,296466
 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.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,,
+ominfra-0.0.0.dev221.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev221.dist-info/METADATA,sha256=7YF7KAovoWQlikujbL9o3ZuFXJaexjVTddE87J7Uj4k,731
+ominfra-0.0.0.dev221.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ominfra-0.0.0.dev221.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev221.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev221.dist-info/RECORD,,