ominfra 0.0.0.dev420__py3-none-any.whl → 0.0.0.dev422__py3-none-any.whl

ominfra/clouds/aws/models/base.py

@@ -1,4 +1,3 @@
-import abc
 import typing as ta
 
 from omlish import cached
@@ -29,7 +28,7 @@ TagList: ta.TypeAlias = ta.Sequence[Tag]
 ##
 
 
-class ValueType(abc.ABC):  # noqa
+class ValueType(lang.Abstract):
     pass
 
 

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

@@ -37,6 +37,11 @@ class ArchitectureValues(_enum.Enum):
     ARM64_MAC = 'arm64_mac'
 
 
+class AttachmentLimitType(_enum.Enum):
+    SHARED = 'shared'
+    DEDICATED = 'dedicated'
+
+
 class AttachmentStatus(_enum.Enum):
     ATTACHING = 'attaching'
     ATTACHED = 'attached'
@@ -1297,6 +1302,32 @@ class InstanceType(_enum.Enum):
     C8GN_METAL_48XL = 'c8gn.metal-48xl'
     F2_6XLARGE = 'f2.6xlarge'
     P6E_GB200_36XLARGE = 'p6e-gb200.36xlarge'
+    G6F_LARGE = 'g6f.large'
+    G6F_XLARGE = 'g6f.xlarge'
+    G6F_2XLARGE = 'g6f.2xlarge'
+    G6F_4XLARGE = 'g6f.4xlarge'
+    GR6F_4XLARGE = 'gr6f.4xlarge'
+    P5_4XLARGE = 'p5.4xlarge'
+    R8I_LARGE = 'r8i.large'
+    R8I_XLARGE = 'r8i.xlarge'
+    R8I_2XLARGE = 'r8i.2xlarge'
+    R8I_4XLARGE = 'r8i.4xlarge'
+    R8I_8XLARGE = 'r8i.8xlarge'
+    R8I_12XLARGE = 'r8i.12xlarge'
+    R8I_16XLARGE = 'r8i.16xlarge'
+    R8I_24XLARGE = 'r8i.24xlarge'
+    R8I_32XLARGE = 'r8i.32xlarge'
+    R8I_48XLARGE = 'r8i.48xlarge'
+    R8I_96XLARGE = 'r8i.96xlarge'
+    R8I_METAL_48XL = 'r8i.metal-48xl'
+    R8I_METAL_96XL = 'r8i.metal-96xl'
+    R8I_FLEX_LARGE = 'r8i-flex.large'
+    R8I_FLEX_XLARGE = 'r8i-flex.xlarge'
+    R8I_FLEX_2XLARGE = 'r8i-flex.2xlarge'
+    R8I_FLEX_4XLARGE = 'r8i-flex.4xlarge'
+    R8I_FLEX_8XLARGE = 'r8i-flex.8xlarge'
+    R8I_FLEX_12XLARGE = 'r8i-flex.12xlarge'
+    R8I_FLEX_16XLARGE = 'r8i-flex.16xlarge'
 
 
 class InstanceTypeHypervisor(_enum.Enum):
@@ -1350,6 +1381,8 @@ MaxNetworkInterfaces = _ta.NewType('MaxNetworkInterfaces', int)
 
 MaximumBandwidthInMbps = _ta.NewType('MaximumBandwidthInMbps', int)
 
+MaximumEbsAttachments = _ta.NewType('MaximumEbsAttachments', int)
+
 MaximumEfaInterfaces = _ta.NewType('MaximumEfaInterfaces', int)
 
 MaximumEnaQueueCount = _ta.NewType('MaximumEnaQueueCount', int)
@@ -4066,6 +4099,18 @@ class EbsInfo(
         shape_name='EbsNvmeSupport',
     ))
 
+    maximum_ebs_attachments: MaximumEbsAttachments | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='MaximumEbsAttachments',
+        serialization_name='maximumEbsAttachments',
+        shape_name='MaximumEbsAttachments',
+    ))
+
+    attachment_limit_type: AttachmentLimitType | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AttachmentLimitType',
+        serialization_name='attachmentLimitType',
+        shape_name='AttachmentLimitType',
+    ))
+
 
 @_dc.dataclass(frozen=True, kw_only=True)
 class EbsInstanceBlockDevice(

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

@@ -208,6 +208,11 @@ class KMSKeyNotAccessibleFault(
     pass
 
 
+class MasterUserAuthenticationType(_enum.Enum):
+    PASSWORD = 'password'
+    IAM_DB_AUTH = 'iam-db-auth'
+
+
 @_dc.dataclass(frozen=True, kw_only=True)
 class NetworkTypeNotSupported(
     _base.Shape,
@@ -1031,6 +1036,11 @@ class CreateDBInstanceMessage(
         shape_name='String',
     ))
 
+    master_user_authentication_type: MasterUserAuthenticationType | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='MasterUserAuthenticationType',
+        shape_name='MasterUserAuthenticationType',
+    ))
+
 
 DomainMembershipList: _ta.TypeAlias = _ta.Sequence[DomainMembership]
 

ominfra/manage/commands/base.py

@@ -5,6 +5,7 @@ import logging
 import traceback
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.strings import snake_case
 
@@ -17,9 +18,9 @@ CommandOutputT = ta.TypeVar('CommandOutputT', bound='Command.Output')
 
 
 @dc.dataclass(frozen=True)
-class Command(abc.ABC, ta.Generic[CommandOutputT]):
+class Command(Abstract, ta.Generic[CommandOutputT]):
     @dc.dataclass(frozen=True)
-    class Output(abc.ABC):  # noqa
+    class Output(Abstract):
         pass
 
     @ta.final
@@ -65,7 +66,7 @@ class CommandException:
         )
 
 
-class CommandOutputOrException(abc.ABC, ta.Generic[CommandOutputT]):
+class CommandOutputOrException(Abstract, ta.Generic[CommandOutputT]):
     @property
     @abc.abstractmethod
     def output(self) -> ta.Optional[CommandOutputT]:
@@ -83,7 +84,7 @@ class CommandOutputOrExceptionData(CommandOutputOrException):
     exception: ta.Optional[CommandException] = None
 
 
-class CommandExecutor(abc.ABC, ta.Generic[CommandT, CommandOutputT]):
+class CommandExecutor(Abstract, ta.Generic[CommandT, CommandOutputT]):
     @abc.abstractmethod
     def execute(self, cmd: CommandT) -> ta.Awaitable[CommandOutputT]:
         raise NotImplementedError

ominfra/manage/deploy/conf/specs.py

@@ -1,9 +1,9 @@
 # ruff: noqa: UP006 UP007 UP045
-import abc
 import dataclasses as dc
 import typing as ta
 
 from omlish.formats.ini.sections import IniSectionSettingsMap
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.marshal import register_single_field_type_obj_marshaler
 
@@ -13,7 +13,7 @@ from ..paths.specs import check_valid_deploy_spec_path
 ##
 
 
-class DeployAppConfContent(abc.ABC):  # noqa
+class DeployAppConfContent(Abstract):
     pass
 
 

ominfra/manage/deploy/paths/owners.py

@@ -3,6 +3,7 @@ import abc
 import os.path
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 from ..types import DeployHome
@@ -12,7 +13,7 @@ from .paths import DeployPath
 ##
 
 
-class DeployPathOwner(abc.ABC):
+class DeployPathOwner(Abstract):
     @abc.abstractmethod
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
         raise NotImplementedError
@@ -21,7 +22,7 @@ class DeployPathOwner(abc.ABC):
 DeployPathOwners = ta.NewType('DeployPathOwners', ta.Sequence[DeployPathOwner])
 
 
-class SingleDirDeployPathOwner(DeployPathOwner, abc.ABC):
+class SingleDirDeployPathOwner(DeployPathOwner, Abstract):
     def __init__(
             self,
             *args: ta.Any,

ominfra/manage/deploy/paths/paths.py

@@ -13,6 +13,7 @@ import dataclasses as dc
 import itertools
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.strings import split_keep_delimiter
@@ -32,7 +33,7 @@ class DeployPathError(Exception):
     pass
 
 
-class DeployPathRenderable(abc.ABC):
+class DeployPathRenderable(Abstract):
     @cached_nullary
     def __str__(self) -> str:
         return self.render(None)
@@ -45,7 +46,7 @@ class DeployPathRenderable(abc.ABC):
 ##
 
 
-class DeployPathNamePart(DeployPathRenderable, abc.ABC):
+class DeployPathNamePart(DeployPathRenderable, Abstract):
     @classmethod
     def parse(cls, s: str) -> 'DeployPathNamePart':
         check.non_empty_str(s)
@@ -137,7 +138,7 @@ class DeployPathName(DeployPathRenderable):
 
 
 @dc.dataclass(frozen=True)
-class DeployPathPart(DeployPathRenderable, abc.ABC):  # noqa
+class DeployPathPart(DeployPathRenderable, Abstract):
     name: DeployPathName
 
     @property

ominfra/manage/deploy/tags.py

@@ -1,8 +1,8 @@
 # ruff: noqa: UP006 UP007 UP045
-import abc
 import dataclasses as dc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.marshal import register_single_field_type_obj_marshaler
 
@@ -30,11 +30,11 @@ DEPLOY_TAG_ILLEGAL_STRS: ta.AbstractSet[str] = frozenset([
 
 
 @dc.dataclass(frozen=True, order=True)
-class DeployTag(abc.ABC):  # noqa
+class DeployTag(Abstract):
     s: str
 
     def __post_init__(self) -> None:
-        check.not_in(abc.ABC, type(self).__bases__)
+        check.not_in(Abstract, type(self).__bases__)
         check.non_empty_str(self.s)
         for ch in DEPLOY_TAG_ILLEGAL_STRS:
             check.state(ch not in self.s)
@@ -47,12 +47,12 @@ class DeployTag(abc.ABC):  # noqa
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
-        if abc.ABC in cls.__bases__:
+        if Abstract in cls.__bases__:
             return
 
         for b in cls.__bases__:
             if issubclass(b, DeployTag):
-                check.in_(abc.ABC, b.__bases__)
+                check.in_(Abstract, b.__bases__)
 
         check.non_empty_str(tn := cls.tag_name)
         check.equal(tn, tn.lower().strip())
@@ -99,7 +99,7 @@ class DeployTime(DeployTag):
 ##
 
 
-class NameDeployTag(DeployTag, abc.ABC):  # noqa
+class NameDeployTag(DeployTag, Abstract):
     pass
 
 
@@ -116,7 +116,7 @@ class DeployConf(NameDeployTag):
 ##
 
 
-class KeyDeployTag(DeployTag, abc.ABC):  # noqa
+class KeyDeployTag(DeployTag, Abstract):
     pass
 
 
@@ -133,7 +133,7 @@ class DeployAppKey(KeyDeployTag):
 ##
 
 
-class RevDeployTag(DeployTag, abc.ABC):  # noqa
+class RevDeployTag(DeployTag, Abstract):
     pass
 
 

ominfra/manage/inject.py

@@ -5,6 +5,7 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 from omlish.lite.marshal import ObjMarshalerManager
+from omlish.lite.marshal import new_obj_marshaler_manager
 
 from .bootstrap import MainBootstrap
 from .commands.inject import bind_commands
@@ -63,7 +64,7 @@ def bind_main(
     #
 
     def build_obj_marshaler_manager(insts: ObjMarshalerInstallers) -> ObjMarshalerManager:
-        msh = ObjMarshalerManager()
+        msh = new_obj_marshaler_manager()
         inst: ObjMarshalerInstaller
         for inst in insts:
             inst.fn(msh)

ominfra/manage/remote/channel.py

@@ -5,6 +5,7 @@ import json
 import struct
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.json import json_dumps_compact
 from omlish.lite.marshal import OBJ_MARSHALER_MANAGER
 from omlish.lite.marshal import ObjMarshalerManager
@@ -16,7 +17,7 @@ T = ta.TypeVar('T')
 ##
 
 
-class RemoteChannel(abc.ABC):
+class RemoteChannel(Abstract):
     @abc.abstractmethod
     def send_obj(self, o: ta.Any, ty: ta.Any = None) -> ta.Awaitable[None]:
         raise NotImplementedError

ominfra/manage/remote/execution.py

@@ -3,7 +3,6 @@
 TODO:
  - sequence all messages
 """
-import abc
 import asyncio
 import dataclasses as dc
 import itertools
@@ -11,6 +10,7 @@ import logging
 import time
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.logs import log
 
@@ -29,7 +29,7 @@ T = ta.TypeVar('T')
 
 
 class _RemoteProtocol:
-    class Message(abc.ABC):  # noqa
+    class Message(Abstract):
         async def send(self, chan: RemoteChannel) -> None:
             await chan.send_obj(self, _RemoteProtocol.Message)
 
@@ -39,7 +39,7 @@ class _RemoteProtocol:
 
     #
 
-    class Request(Message, abc.ABC):  # noqa
+    class Request(Message, Abstract):
         pass
 
     @dc.dataclass(frozen=True)
@@ -53,7 +53,7 @@ class _RemoteProtocol:
 
     #
 
-    class Response(Message, abc.ABC):  # noqa
+    class Response(Message, Abstract):
         pass
 
     @dc.dataclass(frozen=True)

ominfra/manage/remote/spawning.py

@@ -8,6 +8,7 @@ import subprocess
 import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.shlex import shlex_maybe_quote
 from omlish.subprocesses.base import SUBPROCESS_CHANNEL_OPTION_VALUES
@@ -17,7 +18,7 @@ from omlish.subprocesses.base import SubprocessChannelOption
 ##
 
 
-class RemoteSpawning(abc.ABC):
+class RemoteSpawning(Abstract):
     @dc.dataclass(frozen=True)
     class Target:
         shell: ta.Optional[str] = None

ominfra/manage/system/packages.py

@@ -10,6 +10,7 @@ import os
 import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 
@@ -25,7 +26,7 @@ class SystemPackage:
     version: ta.Optional[str] = None
 
 
-class SystemPackageManager(abc.ABC):
+class SystemPackageManager(Abstract):
     @abc.abstractmethod
     def update(self) -> ta.Awaitable[None]:
         raise NotImplementedError

ominfra/manage/system/platforms.py

@@ -1,7 +1,7 @@
-import abc
 import dataclasses as dc
 import sys
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
 from omlish.lite.logs import log
 from omlish.os.linux import LinuxOsRelease
@@ -11,11 +11,11 @@ from omlish.os.linux import LinuxOsRelease
 
 
 @dc.dataclass(frozen=True)
-class Platform(abc.ABC):  # noqa
+class Platform(Abstract):
     pass
 
 
-class LinuxPlatform(Platform, abc.ABC):
+class LinuxPlatform(Platform, Abstract):
     pass
 
 

ominfra/manage/targets/connection.py

@@ -4,6 +4,7 @@ import contextlib
 import dataclasses as dc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 from ..bootstrap import MainBootstrap
@@ -24,7 +25,7 @@ from .targets import SubprocessManageTarget
 ##
 
 
-class ManageTargetConnector(abc.ABC):
+class ManageTargetConnector(Abstract):
     @abc.abstractmethod
     def connect(self, tgt: ManageTarget) -> ta.AsyncContextManager[CommandExecutor]:
         raise NotImplementedError

ominfra/manage/targets/targets.py

@@ -3,18 +3,18 @@
 It's desugaring. Subprocess and locals are only leafs. Retain an origin?
 ** TWO LAYERS ** - ManageTarget is user-facing, ConnectorTarget is bound, internal
 """
-import abc
 import dataclasses as dc
 import enum
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 
 ##
 
 
-class ManageTarget(abc.ABC):  # noqa
+class ManageTarget(Abstract):
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
@@ -36,15 +36,15 @@ class PythonRemoteManageTarget:
 #
 
 
-class RemoteManageTarget(ManageTarget, abc.ABC):
+class RemoteManageTarget(ManageTarget, Abstract):
     pass
 
 
-class PhysicallyRemoteManageTarget(RemoteManageTarget, abc.ABC):
+class PhysicallyRemoteManageTarget(RemoteManageTarget, Abstract):
     pass
 
 
-class LocalManageTarget(ManageTarget, abc.ABC):
+class LocalManageTarget(ManageTarget, Abstract):
     pass