ominfra 0.0.0.dev448__py3-none-any.whl → 0.0.0.dev488__py3-none-any.whl

ominfra/clouds/aws/models/gen/cli.py

@@ -86,7 +86,8 @@ class Cli(ap.Cli):
         fn = svc.name
         if fn in keyword.kwlist:
             fn += '_'
-        output_file = os.path.join(output_dir, f'{fn}.py')
+        output_file = os.path.join(output_dir, fn, '__init__.py')
+        os.makedirs(os.path.dirname(output_file), exist_ok=True)
         with open(output_file, 'w') as f:
             f.write(mod)
 

ominfra/clouds/aws/models/gen/gen.py

@@ -17,7 +17,7 @@ from omlish.lite.strings import snake_case
 
 if ta.TYPE_CHECKING:
     import botocore.loaders
-    import botocore.mode2
+    import botocore.model
     import botocore.session
 else:
     botocore = lang.proxy_import('botocore', extras=[
@@ -175,10 +175,13 @@ class ModelGen:
 
     def get_type_ann(
             self,
-            name: str,
+            name: str | None,
             *,
             unquoted_names: bool = False,
     ) -> str | None:
+        if name is None:
+            return None
+
         try:
             return self.BASE_TYPE_ANNS[name]
         except KeyError:
@@ -300,7 +303,13 @@ class ModelGen:
         '',
         'from omlish import dataclasses as _dc  # noqa',
         '',
-        'from .. import base as _base  # noqa',
+        'from ... import base as _base  # noqa',
+        '',
+        '',
+        '_dc.init_package(',
+        '    globals(),',
+        '    codegen=True,',
+        ')',
         '',
         '',
         '##',
@@ -434,17 +443,17 @@ class ModelGen:
         elif isinstance(shape, botocore.model.MapShape):
             # shape.key, shape.value
             kn = shape.key.name
-            ka = self.get_type_ann(
+            ka2 = self.get_type_ann(
                 kn,
                 unquoted_names=unquoted_names,
             )
             vn = shape.key.name
-            va = self.get_type_ann(
+            va2 = self.get_type_ann(
                 vn,
                 unquoted_names=unquoted_names,
             )
-            l = f'{san_name}: _ta.TypeAlias = _ta.Mapping[{ka or kn}, {va or vn}]'
-            if ka is None or va is None:
+            l = f'{san_name}: _ta.TypeAlias = _ta.Mapping[{ka2 or kn}, {va2 or vn}]'
+            if ka2 is None or va2 is None:
                 l = '# ' + l
             return self.ShapeSrc(l)
 

ominfra/clouds/aws/models/services/{ec2.py → ec2/__init__.py}

@@ -7,7 +7,13 @@ import typing as _ta  # noqa
 
 from omlish import dataclasses as _dc  # noqa
 
-from .. import base as _base  # noqa
+from ... import base as _base  # noqa
+
+
+_dc.init_package(
+    globals(),
+    codegen=True,
+)
 
 
 ##
@@ -298,6 +304,7 @@ class InstanceLifecycleType(_enum.Enum):
     SPOT = 'spot'
     SCHEDULED = 'scheduled'
     CAPACITY_BLOCK = 'capacity-block'
+    INTERRUPTIBLE_CAPACITY_RESERVATION = 'interruptible-capacity-reservation'
 
 
 class InstanceMetadataEndpointState(_enum.Enum):
@@ -1361,6 +1368,86 @@ class InstanceType(_enum.Enum):
     I8GE_METAL_48XL = 'i8ge.metal-48xl'
     MAC_M4_METAL = 'mac-m4.metal'
     MAC_M4PRO_METAL = 'mac-m4pro.metal'
+    R8GN_MEDIUM = 'r8gn.medium'
+    R8GN_LARGE = 'r8gn.large'
+    R8GN_XLARGE = 'r8gn.xlarge'
+    R8GN_2XLARGE = 'r8gn.2xlarge'
+    R8GN_4XLARGE = 'r8gn.4xlarge'
+    R8GN_8XLARGE = 'r8gn.8xlarge'
+    R8GN_12XLARGE = 'r8gn.12xlarge'
+    R8GN_16XLARGE = 'r8gn.16xlarge'
+    R8GN_24XLARGE = 'r8gn.24xlarge'
+    R8GN_48XLARGE = 'r8gn.48xlarge'
+    R8GN_METAL_24XL = 'r8gn.metal-24xl'
+    R8GN_METAL_48XL = 'r8gn.metal-48xl'
+    C8I_LARGE = 'c8i.large'
+    C8I_XLARGE = 'c8i.xlarge'
+    C8I_2XLARGE = 'c8i.2xlarge'
+    C8I_4XLARGE = 'c8i.4xlarge'
+    C8I_8XLARGE = 'c8i.8xlarge'
+    C8I_12XLARGE = 'c8i.12xlarge'
+    C8I_16XLARGE = 'c8i.16xlarge'
+    C8I_24XLARGE = 'c8i.24xlarge'
+    C8I_32XLARGE = 'c8i.32xlarge'
+    C8I_48XLARGE = 'c8i.48xlarge'
+    C8I_96XLARGE = 'c8i.96xlarge'
+    C8I_METAL_48XL = 'c8i.metal-48xl'
+    C8I_METAL_96XL = 'c8i.metal-96xl'
+    C8I_FLEX_LARGE = 'c8i-flex.large'
+    C8I_FLEX_XLARGE = 'c8i-flex.xlarge'
+    C8I_FLEX_2XLARGE = 'c8i-flex.2xlarge'
+    C8I_FLEX_4XLARGE = 'c8i-flex.4xlarge'
+    C8I_FLEX_8XLARGE = 'c8i-flex.8xlarge'
+    C8I_FLEX_12XLARGE = 'c8i-flex.12xlarge'
+    C8I_FLEX_16XLARGE = 'c8i-flex.16xlarge'
+    R8GB_MEDIUM = 'r8gb.medium'
+    R8GB_LARGE = 'r8gb.large'
+    R8GB_XLARGE = 'r8gb.xlarge'
+    R8GB_2XLARGE = 'r8gb.2xlarge'
+    R8GB_4XLARGE = 'r8gb.4xlarge'
+    R8GB_8XLARGE = 'r8gb.8xlarge'
+    R8GB_12XLARGE = 'r8gb.12xlarge'
+    R8GB_16XLARGE = 'r8gb.16xlarge'
+    R8GB_24XLARGE = 'r8gb.24xlarge'
+    R8GB_METAL_24XL = 'r8gb.metal-24xl'
+    M8A_MEDIUM = 'm8a.medium'
+    M8A_LARGE = 'm8a.large'
+    M8A_XLARGE = 'm8a.xlarge'
+    M8A_2XLARGE = 'm8a.2xlarge'
+    M8A_4XLARGE = 'm8a.4xlarge'
+    M8A_8XLARGE = 'm8a.8xlarge'
+    M8A_12XLARGE = 'm8a.12xlarge'
+    M8A_16XLARGE = 'm8a.16xlarge'
+    M8A_24XLARGE = 'm8a.24xlarge'
+    M8A_48XLARGE = 'm8a.48xlarge'
+    M8A_METAL_24XL = 'm8a.metal-24xl'
+    M8A_METAL_48XL = 'm8a.metal-48xl'
+    TRN2_3XLARGE = 'trn2.3xlarge'
+    R8A_MEDIUM = 'r8a.medium'
+    R8A_LARGE = 'r8a.large'
+    R8A_XLARGE = 'r8a.xlarge'
+    R8A_2XLARGE = 'r8a.2xlarge'
+    R8A_4XLARGE = 'r8a.4xlarge'
+    R8A_8XLARGE = 'r8a.8xlarge'
+    R8A_12XLARGE = 'r8a.12xlarge'
+    R8A_16XLARGE = 'r8a.16xlarge'
+    R8A_24XLARGE = 'r8a.24xlarge'
+    R8A_48XLARGE = 'r8a.48xlarge'
+    R8A_METAL_24XL = 'r8a.metal-24xl'
+    R8A_METAL_48XL = 'r8a.metal-48xl'
+    P6_B300_48XLARGE = 'p6-b300.48xlarge'
+    C8A_MEDIUM = 'c8a.medium'
+    C8A_LARGE = 'c8a.large'
+    C8A_XLARGE = 'c8a.xlarge'
+    C8A_2XLARGE = 'c8a.2xlarge'
+    C8A_4XLARGE = 'c8a.4xlarge'
+    C8A_8XLARGE = 'c8a.8xlarge'
+    C8A_12XLARGE = 'c8a.12xlarge'
+    C8A_16XLARGE = 'c8a.16xlarge'
+    C8A_24XLARGE = 'c8a.24xlarge'
+    C8A_48XLARGE = 'c8a.48xlarge'
+    C8A_METAL_24XL = 'c8a.metal-24xl'
+    C8A_METAL_48XL = 'c8a.metal-48xl'
 
 
 class InstanceTypeHypervisor(_enum.Enum):
@@ -1404,6 +1491,7 @@ LocalGatewayId = _ta.NewType('LocalGatewayId', str)
 class MarketType(_enum.Enum):
     SPOT = 'spot'
     CAPACITY_BLOCK = 'capacity-block'
+    INTERRUPTIBLE_CAPACITY_RESERVATION = 'interruptible-capacity-reservation'
 
 
 MaxIpv4AddrPerInterface = _ta.NewType('MaxIpv4AddrPerInterface', int)
@@ -1618,6 +1706,7 @@ class ResourceType(_enum.Enum):
     TRANSIT_GATEWAY_CONNECT_PEER = 'transit-gateway-connect-peer'
     TRANSIT_GATEWAY_MULTICAST_DOMAIN = 'transit-gateway-multicast-domain'
     TRANSIT_GATEWAY_POLICY_TABLE = 'transit-gateway-policy-table'
+    TRANSIT_GATEWAY_METERING_POLICY = 'transit-gateway-metering-policy'
     TRANSIT_GATEWAY_ROUTE_TABLE = 'transit-gateway-route-table'
     TRANSIT_GATEWAY_ROUTE_TABLE_ANNOUNCEMENT = 'transit-gateway-route-table-announcement'
     VOLUME = 'volume'
@@ -1640,6 +1729,7 @@ class ResourceType(_enum.Enum):
     VERIFIED_ACCESS_TRUST_PROVIDER = 'verified-access-trust-provider'
     VPN_CONNECTION_DEVICE_TYPE = 'vpn-connection-device-type'
     VPC_BLOCK_PUBLIC_ACCESS_EXCLUSION = 'vpc-block-public-access-exclusion'
+    VPC_ENCRYPTION_CONTROL = 'vpc-encryption-control'
     ROUTE_SERVER = 'route-server'
     ROUTE_SERVER_ENDPOINT = 'route-server-endpoint'
     ROUTE_SERVER_PEER = 'route-server-peer'
@@ -1650,6 +1740,11 @@ class ResourceType(_enum.Enum):
     IPAM_EXTERNAL_RESOURCE_VERIFICATION_TOKEN = 'ipam-external-resource-verification-token'
     CAPACITY_BLOCK = 'capacity-block'
     MAC_MODIFICATION_TASK = 'mac-modification-task'
+    IPAM_PREFIX_LIST_RESOLVER = 'ipam-prefix-list-resolver'
+    IPAM_POLICY = 'ipam-policy'
+    IPAM_PREFIX_LIST_RESOLVER_TARGET = 'ipam-prefix-list-resolver-target'
+    CAPACITY_MANAGER_DATA_EXPORT = 'capacity-manager-data-export'
+    VPN_CONCENTRATOR = 'vpn-concentrator'
 
 
 class RootDeviceType(_enum.Enum):
@@ -1694,6 +1789,7 @@ class ServiceManaged(_enum.Enum):
     ALB = 'alb'
     NLB = 'nlb'
     RNAT = 'rnat'
+    RDS = 'rds'
 
 
 class ShutdownBehavior(_enum.Enum):
@@ -4906,6 +5002,24 @@ class VpcEncryptionControlExclusions(
         shape_name='VpcEncryptionControlExclusion',
     ))
 
+    lambda_: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='Lambda',
+        serialization_name='lambda',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
+    vpc_lattice: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='VpcLattice',
+        serialization_name='vpcLattice',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
+    elastic_file_system: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='ElasticFileSystem',
+        serialization_name='elasticFileSystem',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
 
 @_dc.dataclass(frozen=True, kw_only=True)
 class VpcIpv6CidrBlockAssociation(
@@ -6695,6 +6809,12 @@ class NetworkInterface(
         shape_name='AssociatedSubnetList',
     ))
 
+    availability_zone_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AvailabilityZoneId',
+        serialization_name='availabilityZoneId',
+        shape_name='String',
+    ))
+
 
 @_dc.dataclass(frozen=True, kw_only=True)
 class NeuronInfo(