ominfra 0.0.0.dev438__tar.gz → 0.0.0.dev440__tar.gz

{ominfra-0.0.0.dev438/ominfra.egg-info → ominfra-0.0.0.dev440}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev438
+Version: 0.0.0.dev440
 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.dev438
-Requires-Dist: omlish==0.0.0.dev438
+Requires-Dist: omdev==0.0.0.dev440
+Requires-Dist: omlish==0.0.0.dev440
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev438 → ominfra-0.0.0.dev440}/ominfra/scripts/journald2aws.py

@@ -1368,6 +1368,7 @@ class AttrOps(ta.Generic[T]):
                 o: ta.Union[
                     str,
                     ta.Tuple[str, str],
+                    ta.Mapping[str, ta.Any],
                     'AttrOps.Attr',
                 ],
         ) -> 'AttrOps.Attr':
@@ -1375,12 +1376,16 @@ class AttrOps(ta.Generic[T]):
                 return o
             elif isinstance(o, str):
                 return cls(o)
-            else:
+            elif isinstance(o, tuple):
                 name, disp = o
                 return cls(
                     name,
                     display=disp,
                 )
+            elif isinstance(o, ta.Mapping):
+                return cls(**o)
+            else:
+                raise TypeError(o)
 
         @property
         def name(self) -> str:
@@ -1404,6 +1409,7 @@ class AttrOps(ta.Generic[T]):
             *attrs: ta.Sequence[ta.Union[
                 str,
                 ta.Tuple[str, str],
+                ta.Mapping[str, ta.Any],
                 Attr,
             ]],
             with_module: bool = False,
@@ -1488,8 +1494,8 @@ class AttrOps(ta.Generic[T]):
 
         attrs: ta.List[AttrOps.Attr] = []
         for o in raw:
-            if isinstance(o, AttrOps.Attr):
-                attrs.append(o)
+            if isinstance(o, (AttrOps.Attr, ta.Mapping)):
+                attrs.append(AttrOps.Attr.of(o))
                 continue
 
             if isinstance(o, tuple):

{ominfra-0.0.0.dev438 → ominfra-0.0.0.dev440}/ominfra/scripts/manage.py

@@ -2547,6 +2547,7 @@ class AttrOps(ta.Generic[T]):
                 o: ta.Union[
                     str,
                     ta.Tuple[str, str],
+                    ta.Mapping[str, ta.Any],
                     'AttrOps.Attr',
                 ],
         ) -> 'AttrOps.Attr':
@@ -2554,12 +2555,16 @@ class AttrOps(ta.Generic[T]):
                 return o
             elif isinstance(o, str):
                 return cls(o)
-            else:
+            elif isinstance(o, tuple):
                 name, disp = o
                 return cls(
                     name,
                     display=disp,
                 )
+            elif isinstance(o, ta.Mapping):
+                return cls(**o)
+            else:
+                raise TypeError(o)
 
         @property
         def name(self) -> str:
@@ -2583,6 +2588,7 @@ class AttrOps(ta.Generic[T]):
             *attrs: ta.Sequence[ta.Union[
                 str,
                 ta.Tuple[str, str],
+                ta.Mapping[str, ta.Any],
                 Attr,
             ]],
             with_module: bool = False,
@@ -2667,8 +2673,8 @@ class AttrOps(ta.Generic[T]):
 
         attrs: ta.List[AttrOps.Attr] = []
         for o in raw:
-            if isinstance(o, AttrOps.Attr):
-                attrs.append(o)
+            if isinstance(o, (AttrOps.Attr, ta.Mapping)):
+                attrs.append(AttrOps.Attr.of(o))
                 continue
 
             if isinstance(o, tuple):

{ominfra-0.0.0.dev438 → ominfra-0.0.0.dev440}/ominfra/scripts/supervisor.py

@@ -1893,6 +1893,7 @@ class AttrOps(ta.Generic[T]):
                 o: ta.Union[
                     str,
                     ta.Tuple[str, str],
+                    ta.Mapping[str, ta.Any],
                     'AttrOps.Attr',
                 ],
         ) -> 'AttrOps.Attr':
@@ -1900,12 +1901,16 @@ class AttrOps(ta.Generic[T]):
                 return o
             elif isinstance(o, str):
                 return cls(o)
-            else:
+            elif isinstance(o, tuple):
                 name, disp = o
                 return cls(
                     name,
                     display=disp,
                 )
+            elif isinstance(o, ta.Mapping):
+                return cls(**o)
+            else:
+                raise TypeError(o)
 
         @property
         def name(self) -> str:
@@ -1929,6 +1934,7 @@ class AttrOps(ta.Generic[T]):
             *attrs: ta.Sequence[ta.Union[
                 str,
                 ta.Tuple[str, str],
+                ta.Mapping[str, ta.Any],
                 Attr,
             ]],
             with_module: bool = False,
@@ -2013,8 +2019,8 @@ class AttrOps(ta.Generic[T]):
 
         attrs: ta.List[AttrOps.Attr] = []
         for o in raw:
-            if isinstance(o, AttrOps.Attr):
-                attrs.append(o)
+            if isinstance(o, (AttrOps.Attr, ta.Mapping)):
+                attrs.append(AttrOps.Attr.of(o))
                 continue
 
             if isinstance(o, tuple):

{ominfra-0.0.0.dev438 → ominfra-0.0.0.dev440/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev438
+Version: 0.0.0.dev440
 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.dev438
-Requires-Dist: omlish==0.0.0.dev438
+Requires-Dist: omdev==0.0.0.dev440
+Requires-Dist: omlish==0.0.0.dev440
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev438 → ominfra-0.0.0.dev440}/ominfra.egg-info/requires.txt

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

{ominfra-0.0.0.dev438 → ominfra-0.0.0.dev440}/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.dev438'
+version = '0.0.0.dev440'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev438',
-    'omlish == 0.0.0.dev438',
+    'omdev == 0.0.0.dev440',
+    'omlish == 0.0.0.dev440',
 ]
 
 [project.optional-dependencies]