ominfra 0.0.0.dev352__py3-none-any.whl → 0.0.0.dev354__py3-none-any.whl

ominfra/clouds/aws/models/services/ec2.py

@@ -1565,6 +1565,7 @@ class ResourceType(_enum.Enum):
     INSTANCE_CONNECT_ENDPOINT = 'instance-connect-endpoint'
     VERIFIED_ACCESS_ENDPOINT_TARGET = 'verified-access-endpoint-target'
     IPAM_EXTERNAL_RESOURCE_VERIFICATION_TOKEN = 'ipam-external-resource-verification-token'
+    CAPACITY_BLOCK = 'capacity-block'
     MAC_MODIFICATION_TASK = 'mac-modification-task'
 
 
@@ -7691,6 +7692,12 @@ class Instance(
         shape_name='CpuOptions',
     ))
 
+    capacity_block_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='CapacityBlockId',
+        serialization_name='capacityBlockId',
+        shape_name='String',
+    ))
+
     capacity_reservation_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='CapacityReservationId',
         serialization_name='capacityReservationId',

ominfra/manage/main.py

@@ -1,7 +1,7 @@
 # @omlish-amalg ../scripts/manage.py
 # ruff: noqa: UP006 UP007 UP045
 """
-manage.py -s 'docker run -i python:3.12'
+manage.py -s 'docker run -i python:3.13'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 """
 import asyncio

ominfra/scripts/manage.py

@@ -7,7 +7,7 @@
 # @omlish-git-diff-omit
 # ruff: noqa: N802 TC003 UP006 UP007 UP036 UP045
 """
-manage.py -s 'docker run -i python:3.12'
+manage.py -s 'docker run -i python:3.13'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 """
 import abc
@@ -3870,7 +3870,7 @@ ID=ubuntu
 ID_LIKE=debian
 UBUNTU_CODENAME=jammy
 
-➜  omlish git:(master) docker run -i python:3.12 cat /etc/os-release
+➜  omlish git:(master) docker run -i python:3.13 cat /etc/os-release
 PRETTY_NAME="Debian GNU/Linux 12 (bookworm)"
 NAME="Debian GNU/Linux"
 VERSION_ID="12"

ominfra/scripts/supervisor.py

@@ -7996,7 +7996,11 @@ class CoroHttpServer:
 
     #
 
-    def coro_handle(self) -> ta.Generator[Io, ta.Optional[bytes], None]:
+    @dc.dataclass(frozen=True)
+    class CoroHandleResult:
+        close_reason: ta.Literal['response', 'internal', None] = None
+
+    def coro_handle(self) -> ta.Generator[Io, ta.Optional[bytes], CoroHandleResult]:
         return self._coro_run_handler(self._coro_handle_one())
 
     class Close(Exception):  # noqa
@@ -8009,7 +8013,7 @@ class CoroHttpServer:
                 ta.Optional[bytes],
                 None,
             ],
-    ) -> ta.Generator[Io, ta.Optional[bytes], None]:
+    ) -> ta.Generator[Io, ta.Optional[bytes], CoroHandleResult]:
         i: ta.Optional[bytes]
         o: ta.Any = next(gen)
         while True:
@@ -8033,7 +8037,9 @@ class CoroHttpServer:
 
                     o.close()
                     if o.close_connection:
-                        break
+                        return self.CoroHandleResult(
+                            close_reason='response',
+                        )
                     o = None
 
                 else:
@@ -8042,9 +8048,11 @@ class CoroHttpServer:
                 try:
                     o = gen.send(i)
                 except self.Close:
-                    return
+                    return self.CoroHandleResult(
+                        close_reason='internal',
+                    )
                 except StopIteration:
-                    break
+                    return self.CoroHandleResult()
 
             except Exception:  # noqa
                 if hasattr(o, 'close'):
@@ -8893,7 +8901,13 @@ class CoroHttpServerConnectionFdioHandler(SocketFdioHandler):
             addr,
             handler=self._handler,
         )
-        self._srv_coro: ta.Optional[ta.Generator[CoroHttpServer.Io, ta.Optional[bytes], None]] = self._coro_srv.coro_handle()  # noqa
+        self._srv_coro: ta.Optional[
+            ta.Generator[
+                CoroHttpServer.Io,
+                ta.Optional[bytes],
+                CoroHttpServer.CoroHandleResult,
+            ],
+        ] = self._coro_srv.coro_handle()
 
         self._cur_io: ta.Optional[CoroHttpServer.Io] = None
         self._next_io()

{ominfra-0.0.0.dev352.dist-info → ominfra-0.0.0.dev354.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev352
+Version: 0.0.0.dev354
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,10 +10,10 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
-Requires-Python: >=3.12
+Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev352
-Requires-Dist: omlish==0.0.0.dev352
+Requires-Dist: omdev==0.0.0.dev354
+Requires-Dist: omlish==0.0.0.dev354
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev352.dist-info → ominfra-0.0.0.dev354.dist-info}/RECORD

@@ -30,7 +30,7 @@ ominfra/clouds/aws/models/gen/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDP
 ominfra/clouds/aws/models/gen/cli.py,sha256=vcI8_-BOv4f-s_TFAqvnyzvBexZ_9y5akiUEGfioCqA,3857
 ominfra/clouds/aws/models/gen/gen.py,sha256=4pftOlyEIxDDoe73c5Z7NaJ1uhFsTBnMwmS1nlDiLOE,15903
 ominfra/clouds/aws/models/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/clouds/aws/models/services/ec2.py,sha256=VAW1kt4IvBCK0cu2K_5uXFPs1m0T6G_OcnxKJFD8FJQ,276239
+ominfra/clouds/aws/models/services/ec2.py,sha256=ZZg9cn6UiHxivVOA9LQa3m2ZQ6HxSbkwyYGA6iyvWVs,276490
 ominfra/clouds/aws/models/services/lambda_.py,sha256=dp2I4ZVDb6Dci15XcjPPURUElyzH8cwhM911J_HM7Qo,25823
 ominfra/clouds/aws/models/services/rds.py,sha256=cYjqdM3Sm3F0qpxinA8A8ofXi_HZflK3epu_sog7LzQ,59759
 ominfra/clouds/aws/models/services/s3.py,sha256=aWbl4YtAiQyBfcNgerNxfWBIHZsbpFlT66JdRBYnQ9c,51426
@@ -52,7 +52,7 @@ ominfra/manage/bootstrap.py,sha256=JPz84-bTjpUsXGqusUwQsGZUV1d5Sl3b148Zid4jrCw,4
 ominfra/manage/bootstrap_.py,sha256=slm-rbz59-n1kHCG2ncy3QZ99-0w5vAFOodajgc8vf4,662
 ominfra/manage/config.py,sha256=VkhKcjunBWbb2VmmwaBuocOVEaNLnE9OTfWs428XHDE,190
 ominfra/manage/inject.py,sha256=LgDGyELPerQYR-zHJNigp5O--xY1EnPKPkG-GkfbVRk,2036
-ominfra/manage/main.py,sha256=PsKJBy3eO5801EtEanegdZUpVRtL28oVtwcsWaFzqLY,4453
+ominfra/manage/main.py,sha256=1kz0Zhr0n8Qq-r2tebpeMlyg9JhJ0aWctrR7gyorjGo,4453
 ominfra/manage/marshal.py,sha256=WKj7IU9bo4fBMSSzT6ZMm_WFalXIJZ-V7j8oi92fNhk,305
 ominfra/manage/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/commands/base.py,sha256=8wXSlvihd4GBwYa05HZ9QD2-uiH7dUqEG0uP6flxuJQ,3999
@@ -113,8 +113,8 @@ ominfra/manage/targets/inject.py,sha256=WhkEAB5BFWtENnVMmuiy9eoBNd6jBPSGZsWjT_9_
 ominfra/manage/targets/targets.py,sha256=WmasYmL6xfAI7F0XvDhScFdBVxkqPkmo_gRgABmmkGA,1891
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=7bZWgNeZuTAs6fBl4XBApOfJt4pg_iykoUsjuzX29wc,171893
-ominfra/scripts/manage.py,sha256=WcsDOqnTSzmVWWOT__sdK0jYAap7KdoIt_zt19jVeec,385567
-ominfra/scripts/supervisor.py,sha256=olFNxtJuKf4P2jynEQ1bOpBvviZbipmioR7rg2sgpss,303917
+ominfra/scripts/manage.py,sha256=Jm6-X8kVySJv5fVj6sIwJa4V8tEOhyfYCAc7lw89Tyk,385567
+ominfra/scripts/supervisor.py,sha256=lvYjMMIxM32xehKBWTqLFAi5Ee6rYimc33QTKvM2SxQ,304398
 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=zRV7-tKB7kBah1oTVZlol-vwx1FBlnfzYAPGkeU5jX4,3543
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev352.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev352.dist-info/METADATA,sha256=rSVdT9G_tS-I3XtpXzsPowc6WKSjEq5l6wjG2aOgZag,753
-ominfra-0.0.0.dev352.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ominfra-0.0.0.dev352.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev352.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev352.dist-info/RECORD,,
+ominfra-0.0.0.dev354.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev354.dist-info/METADATA,sha256=xtUPe1m5Xm19KxqSG7cjdMvqRdsOfM5YqnY2Vclzo-4,753
+ominfra-0.0.0.dev354.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ominfra-0.0.0.dev354.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev354.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev354.dist-info/RECORD,,