ominfra 0.0.0.dev438__py3-none-any.whl → 0.0.0.dev440__py3-none-any.whl

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/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/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.dist-info → ominfra-0.0.0.dev440.dist-info}/METADATA

@@ -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.dist-info → ominfra-0.0.0.dev440.dist-info}/RECORD

@@ -112,9 +112,9 @@ ominfra/manage/targets/connection.py,sha256=mOHCsDVG-DZBhl3Mb7TTr1vhPb0gxDOOMW1x
 ominfra/manage/targets/inject.py,sha256=3M4wBkxtvymq_yhiotHlTN8iydELMjVCndyp9Bq-4eo,1572
 ominfra/manage/targets/targets.py,sha256=LjSQrDsHEjEQMDHcxtNKmLjy0YGLXJRGPFdUjazzFIM,1918
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=liuYP9LafxEtdpTNwmg0NNud3jvREALZinjOm185x6c,242365
-ominfra/scripts/manage.py,sha256=z15lbtJDoDWCOwdyxstghnE311b5SMiE9r9Zdru6Kus,466302
-ominfra/scripts/supervisor.py,sha256=hnvhbeCLrvEzyavM6NjVS5s0ohetXXiGrFVyfOe2FXs,375921
+ominfra/scripts/journald2aws.py,sha256=9DWt-aBq8D247C80cgp6xzDPujHAi4iRtpC0Sj2_5xs,242632
+ominfra/scripts/manage.py,sha256=xYZht72US3brB1xJI6XonccohRFIfflNR1OjlMvZh4I,466569
+ominfra/scripts/supervisor.py,sha256=KodoaDPmIqOLXGoVdh0t-lqA3dKSUVIXqPgirA4yn38,376188
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=XASv9C_CWI-u-yX5jVzhJrkJhlwQRkYQWQQG1uJwAd8,1375
 ominfra/tailscale/cli.py,sha256=zRV7-tKB7kBah1oTVZlol-vwx1FBlnfzYAPGkeU5jX4,3543
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=ePmo7cUAiBZARkM_3K4GKYZXxV73An_aioS1m-AAJis,6181
-ominfra-0.0.0.dev438.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev438.dist-info/METADATA,sha256=7e0HRxeduJRQEC70T8XovUdOfx14ilWenwbtqAIHGak,2377
-ominfra-0.0.0.dev438.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ominfra-0.0.0.dev438.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev438.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev438.dist-info/RECORD,,
+ominfra-0.0.0.dev440.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev440.dist-info/METADATA,sha256=gA2kUkRYpjv71ka0JLc_GgMy6b5ADK8gcbTrsmHi-k4,2377
+ominfra-0.0.0.dev440.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ominfra-0.0.0.dev440.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev440.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev440.dist-info/RECORD,,