ominfra 0.0.0.dev208__tar.gz → 0.0.0.dev210__tar.gz

{ominfra-0.0.0.dev208/ominfra.egg-info → ominfra-0.0.0.dev210}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev208
+Version: 0.0.0.dev210
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,9 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev208
-Requires-Dist: omlish==0.0.0.dev208
-Requires-Dist: omserv==0.0.0.dev208
+Requires-Dist: omdev==0.0.0.dev210
+Requires-Dist: omlish==0.0.0.dev210
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev208 → ominfra-0.0.0.dev210}/ominfra/__about__.py

@@ -10,7 +10,6 @@ class Project(ProjectBase):
     dependencies = [
         f'omdev == {__version__}',
         f'omlish == {__version__}',
-        f'omserv == {__version__}',
     ]
 
     optional_dependencies = {

{ominfra-0.0.0.dev208 → ominfra-0.0.0.dev210}/ominfra/clouds/aws/journald2aws/main.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # @omlish-amalg ../../../scripts/journald2aws.py
 import argparse
 import dataclasses as dc

{ominfra-0.0.0.dev208 → ominfra-0.0.0.dev210}/ominfra/clouds/aws/models/base.py

@@ -1,3 +1,4 @@
+import abc
 import typing as ta
 
 from omlish import cached
@@ -16,10 +17,33 @@ Timestamp = ta.NewType('Timestamp', str)
 ##
 
 
-class TagList:
+@dc.dataclass(frozen=True)
+class Tag:
+    key: str
+    value: str
+
+
+TagList: ta.TypeAlias = ta.Sequence[Tag]
+
+
+##
+
+
+class ValueType(abc.ABC):  # noqa
     pass
 
 
+@dc.dataclass(frozen=True)
+class ListValueType(ValueType):
+    e: type
+
+
+@dc.dataclass(frozen=True)
+class MapValueType(ValueType):
+    k: type
+    v: type
+
+
 ##
 
 
@@ -71,27 +95,27 @@ class ShapeInfo:
 
     #
 
-    @cached.function
+    @cached.property
     def fields(self) -> ta.Sequence[dc.Field]:
         check.state(dc.is_immediate_dataclass(self._cls))
         fls = dc.fields(self._cls)
         return fls  # noqa
 
-    @cached.function
+    @cached.property
     def fields_by_name(self) -> ta.Mapping[str, dc.Field]:
-        return col.make_map_by(lambda fl: fl.name, self.fields(), strict=True)
+        return col.make_map_by(lambda fl: fl.name, self.fields, strict=True)
 
-    @cached.function
+    @cached.property
     def fields_by_member_name(self) -> ta.Mapping[str, dc.Field]:
         return col.make_map(
-            [(n, f) for f in self.fields() if (n := f.metadata.get(MEMBER_NAME)) is not None],
+            [(n, f) for f in self.fields if (n := f.metadata.get(MEMBER_NAME)) is not None],
             strict=True,
         )
 
-    @cached.function
+    @cached.property
     def fields_by_serialization_name(self) -> ta.Mapping[str, dc.Field]:
         l = []
-        for f in self.fields():
+        for f in self.fields:
             if sn := f.metadata.get(SERIALIZATION_NAME):
                 l.append((sn, f))
             elif mn := f.metadata.get(MEMBER_NAME):
@@ -99,9 +123,9 @@ class ShapeInfo:
         return col.make_map(l, strict=True)
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass(frozen=True, kw_only=True)
 class Shape:
-    __shape__: ShapeInfo
+    __shape__: ta.ClassVar[ShapeInfo]
 
     def __init_subclass__(
             cls,
@@ -132,10 +156,18 @@ class SERIALIZATION_NAME(lang.Marker):  # noqa
     pass
 
 
+class VALUE_TYPE(lang.Marker):  # noqa
+    pass
+
+
+#
+
+
 def field_metadata(
         *,
         member_name: str | None = None,
         serialization_name: str | None = None,
+        value_type: ValueType | None = None,
         **kwargs: ta.Any,
 ) -> dict[ta.Any, ta.Any]:
     md = {**common_metadata(**kwargs)}
@@ -144,6 +176,8 @@ def field_metadata(
         md[MEMBER_NAME] = member_name
     if serialization_name is not None:
         md[SERIALIZATION_NAME] = serialization_name
+    if value_type is not None:
+        md[VALUE_TYPE] = value_type
 
     return md
 

{ominfra-0.0.0.dev208 → ominfra-0.0.0.dev210}/ominfra/clouds/aws/models/gen/gen.py

@@ -164,6 +164,7 @@ class ModelGen:
         'DateTime': '_base.DateTime',
         'MillisecondDateTime': '_base.MillisecondDateTime',
 
+        'Tag': '_base.Tag',
         'TagList': '_base.TagList',
     }
 
@@ -303,6 +304,8 @@ class ModelGen:
         san_name = self.sanitize_global_name(shape.name, upper=True)
 
         if isinstance(shape, botocore.model.StructureShape):
+            rms = frozenset(shape.required_members or [])
+
             lines: list[str] = []
 
             mds = [
@@ -310,7 +313,7 @@ class ModelGen:
             ]
 
             lines.extend([
-                '@_dc.dataclass(frozen=True)',
+                '@_dc.dataclass(frozen=True, kw_only=True)',
                 f'class {san_name}(',
                 '    _base.Shape,',
                 *[f'    {dl},' for dl in mds],
@@ -320,27 +323,64 @@ class ModelGen:
             if not shape.members:
                 lines.append('    pass')
 
+            ms: botocore.model.Shape
             for i, (mn, ms) in enumerate(shape.members.items()):
-                if i:
-                    lines.append('')
-                fn = self.sanitize_local_name(self.demangle_name(mn))
                 mds = [
                     f'member_name={mn!r}',
                 ]
+
                 if msn := ms.serialization.get('name'):
                     mds.append(f'serialization_name={msn!r}')
+
+                if isinstance(ms, botocore.model.MapShape):
+                    ka = self.get_type_ann(
+                        ms.key.name,
+                        unquoted_names=unquoted_names,
+                    ) or ms.key.name
+                    va = self.get_type_ann(
+                        ms.value.name,
+                        unquoted_names=unquoted_names,
+                    ) or ms.value.name
+                    mds.append(f'value_type=_base.MapValueType({ka}, {va})')
+
+                elif isinstance(ms, botocore.model.ListShape):
+                    ea = self.get_type_ann(
+                        ms.member.name,
+                        unquoted_names=unquoted_names,
+                    ) or ms.member.name
+                    mds.append(f'value_type=_base.ListValueType({ea})')
+
                 mds.append(f'shape_name={ms.name!r}')
+
                 ma = self.get_type_ann(
                     ms.name,
                     unquoted_names=unquoted_names,
                 )
+
+                #
+
+                if i:
+                    lines.append('')
+
+                fr = mn in rms
+                fa = ma or ms.name
+                if fr:
+                    fd = ''
+                else:
+                    fa += ' | None'
+                    fd = 'default=None, '
+
+                fn = self.sanitize_local_name(self.demangle_name(mn))
+
                 fls = [
-                    f'{fn}: {ma or ms.name} = _dc.field(metadata=_base.field_metadata(',
+                    f'{fn}: {fa} = _dc.field({fd}metadata=_base.field_metadata(',
                     *[f'    {dl},' for dl in mds],
                     '))',
                 ]
+
                 if ma is None:
                     fls = ['# ' + fl for fl in fls]
+
                 lines.append('\n'.join('    ' + fl for fl in fls))
 
             return self.ShapeSrc(