ominfra 0.0.0.dev220__tar.gz → 0.0.0.dev222__tar.gz

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

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

{ominfra-0.0.0.dev220 → ominfra-0.0.0.dev222}/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.dev220 → ominfra-0.0.0.dev222}/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 → ominfra-0.0.0.dev222/ominfra.egg-info}/PKG-INFO

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

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

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

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