ominfra 0.0.0.dev387__tar.gz → 0.0.0.dev389__tar.gz

{ominfra-0.0.0.dev387/ominfra.egg-info → ominfra-0.0.0.dev389}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev387
+Version: 0.0.0.dev389
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev387
-Requires-Dist: omlish==0.0.0.dev387
+Requires-Dist: omdev==0.0.0.dev389
+Requires-Dist: omlish==0.0.0.dev389
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev387 → ominfra-0.0.0.dev389}/ominfra/clouds/aws/models/services/ec2.py

@@ -46,6 +46,8 @@ class AttachmentStatus(_enum.Enum):
 
 AutoRecoveryFlag = _ta.NewType('AutoRecoveryFlag', bool)
 
+AvailabilityZoneId = _ta.NewType('AvailabilityZoneId', str)
+
 
 class BandwidthWeightingType(_enum.Enum):
     DEFAULT = 'default'
@@ -3369,6 +3371,12 @@ class Placement(
     _base.Shape,
     shape_name='Placement',
 ):
+    availability_zone_id: AvailabilityZoneId | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AvailabilityZoneId',
+        serialization_name='availabilityZoneId',
+        shape_name='AvailabilityZoneId',
+    ))
+
     affinity: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='Affinity',
         serialization_name='affinity',
@@ -4576,6 +4584,12 @@ class RouteTableAssociation(
         shape_name='String',
     ))
 
+    public_ipv4_pool: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='PublicIpv4Pool',
+        serialization_name='publicIpv4Pool',
+        shape_name='String',
+    ))
+
     association_state: RouteTableAssociationState | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='AssociationState',
         serialization_name='associationState',

{ominfra-0.0.0.dev387 → ominfra-0.0.0.dev389}/ominfra/scripts/manage.py

@@ -8392,6 +8392,17 @@ class SubprocessRun:
             async_subprocesses = self._DEFAULT_ASYNC_SUBPROCESSES
         return await check.not_none(async_subprocesses).run_(self.replace(**kwargs))
 
+    _DEFAULT_MAYSYNC_SUBPROCESSES: ta.ClassVar[ta.Optional[ta.Any]] = None  # AbstractMaysyncSubprocesses
+
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> SubprocessRunOutput:
+        if maysync_subprocesses is None:
+            maysync_subprocesses = self._DEFAULT_MAYSYNC_SUBPROCESSES
+        return await check.not_none(maysync_subprocesses).run_(self.replace(**kwargs))
+
 
 SubprocessRun._FIELD_NAMES = frozenset(fld.name for fld in dc.fields(SubprocessRun))  # noqa
 
@@ -8424,6 +8435,13 @@ class SubprocessRunnable(abc.ABC, ta.Generic[T]):
     ) -> T:
         return self.handle_run_output(await self.make_run().async_run(async_subprocesses, **kwargs))
 
+    async def maysync_run(
+            self,
+            maysync_subprocesses: ta.Optional[ta.Any] = None,  # AbstractMaysyncSubprocesses
+            **kwargs: ta.Any,
+    ) -> T:
+        return self.handle_run_output(await self.make_run().maysync_run(maysync_subprocesses, **kwargs))
+
 
 ########################################
 # ../../../omlish/text/indent.py
@@ -10881,7 +10899,7 @@ def _remote_execution_main() -> None:
 
 
 ########################################
-# ../../../omlish/subprocesses/async_.py
+# ../../../omlish/subprocesses/asyncs.py
 
 
 ##
@@ -10889,7 +10907,7 @@ def _remote_execution_main() -> None:
 
 class AbstractAsyncSubprocesses(BaseSubprocesses):
     @abc.abstractmethod
-    async def run_(self, run: SubprocessRun) -> SubprocessRunOutput:
+    def run_(self, run: SubprocessRun) -> ta.Awaitable[SubprocessRunOutput]:
         raise NotImplementedError
 
     def run(
@@ -10912,31 +10930,41 @@ class AbstractAsyncSubprocesses(BaseSubprocesses):
 
     #
 
-    @abc.abstractmethod
     async def check_call(
             self,
             *cmd: str,
             stdout: ta.Any = sys.stderr,
             **kwargs: ta.Any,
     ) -> None:
-        raise NotImplementedError
+        await self.run(
+            *cmd,
+            stdout=stdout,
+            check=True,
+            **kwargs,
+        )
 
-    @abc.abstractmethod
     async def check_output(
             self,
             *cmd: str,
+            stdout: ta.Any = subprocess.PIPE,
             **kwargs: ta.Any,
     ) -> bytes:
-        raise NotImplementedError
-
-    #
+        return check.not_none((await self.run(
+            *cmd,
+            stdout=stdout,
+            check=True,
+            **kwargs,
+        )).stdout)
 
     async def check_output_str(
             self,
             *cmd: str,
             **kwargs: ta.Any,
     ) -> str:
-        return (await self.check_output(*cmd, **kwargs)).decode().strip()
+        return (await self.check_output(
+            *cmd,
+            **kwargs,
+        )).decode().strip()
 
     #
 
@@ -11091,6 +11119,8 @@ class Subprocesses(AbstractSubprocesses):
             stderr=proc.stderr,  # noqa
         )
 
+    #
+
     def check_call(
             self,
             *cmd: str,
@@ -11482,25 +11512,6 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
             stderr=stderr,
         )
 
-    #
-
-    async def check_call(
-            self,
-            *cmd: str,
-            stdout: ta.Any = sys.stderr,
-            **kwargs: ta.Any,
-    ) -> None:
-        with self.prepare_and_wrap(*cmd, stdout=stdout, check=True, **kwargs) as (cmd, kwargs):  # noqa
-            await self.run(*cmd, **kwargs)
-
-    async def check_output(
-            self,
-            *cmd: str,
-            **kwargs: ta.Any,
-    ) -> bytes:
-        with self.prepare_and_wrap(*cmd, stdout=subprocess.PIPE, check=True, **kwargs) as (cmd, kwargs):  # noqa
-            return check.not_none((await self.run(*cmd, **kwargs)).stdout)
-
 
 asyncio_subprocesses = AsyncioSubprocesses()
 

{ominfra-0.0.0.dev387 → ominfra-0.0.0.dev389/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev387
+Version: 0.0.0.dev389
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev387
-Requires-Dist: omlish==0.0.0.dev387
+Requires-Dist: omdev==0.0.0.dev389
+Requires-Dist: omlish==0.0.0.dev389
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev387 → ominfra-0.0.0.dev389}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev387
-omlish==0.0.0.dev387
+omdev==0.0.0.dev389
+omlish==0.0.0.dev389
 
 [all]
 paramiko~=4.0

{ominfra-0.0.0.dev387 → ominfra-0.0.0.dev389}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev387'
+version = '0.0.0.dev389'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev387',
-    'omlish == 0.0.0.dev387',
+    'omdev == 0.0.0.dev389',
+    'omlish == 0.0.0.dev389',
 ]
 
 [project.optional-dependencies]