ominfra 0.0.0.dev209__py3-none-any.whl → 0.0.0.dev211__py3-none-any.whl

ominfra/manage/main.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # @omlish-amalg ../scripts/manage.py
 # ruff: noqa: UP006 UP007
 """

ominfra/scripts/journald2aws.py

@@ -1719,7 +1719,7 @@ def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
 ##
 
 
-def camel_case(name: str, lower: bool = False) -> str:
+def camel_case(name: str, *, lower: bool = False) -> str:
     if not name:
         return ''
     s = ''.join(map(str.capitalize, name.split('_')))  # noqa
@@ -1736,6 +1736,27 @@ def snake_case(name: str) -> str:
 ##
 
 
+def is_dunder(name: str) -> bool:
+    return (
+        name[:2] == name[-2:] == '__' and
+        name[2:3] != '_' and
+        name[-3:-2] != '_' and
+        len(name) > 4
+    )
+
+
+def is_sunder(name: str) -> bool:
+    return (
+        name[0] == name[-1] == '_' and
+        name[1:2] != '_' and
+        name[-2:-1] != '_' and
+        len(name) > 2
+    )
+
+
+##
+
+
 def strip_with_newline(s: str) -> str:
     if not s:
         return ''
@@ -1767,27 +1788,6 @@ def split_keep_delimiter(s, d):
 ##
 
 
-def is_dunder(name: str) -> bool:
-    return (
-        name[:2] == name[-2:] == '__' and
-        name[2:3] != '_' and
-        name[-3:-2] != '_' and
-        len(name) > 4
-    )
-
-
-def is_sunder(name: str) -> bool:
-    return (
-        name[0] == name[-1] == '_' and
-        name[1:2] != '_' and
-        name[-2:-1] != '_' and
-        len(name) > 2
-    )
-
-
-##
-
-
 def attr_repr(obj: ta.Any, *attrs: str) -> str:
     return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
 

ominfra/scripts/manage.py

@@ -2952,7 +2952,7 @@ def read_package_resource_text(package: str, resource: str) -> str:
 ##
 
 
-def camel_case(name: str, lower: bool = False) -> str:
+def camel_case(name: str, *, lower: bool = False) -> str:
     if not name:
         return ''
     s = ''.join(map(str.capitalize, name.split('_')))  # noqa
@@ -2969,6 +2969,27 @@ def snake_case(name: str) -> str:
 ##
 
 
+def is_dunder(name: str) -> bool:
+    return (
+        name[:2] == name[-2:] == '__' and
+        name[2:3] != '_' and
+        name[-3:-2] != '_' and
+        len(name) > 4
+    )
+
+
+def is_sunder(name: str) -> bool:
+    return (
+        name[0] == name[-1] == '_' and
+        name[1:2] != '_' and
+        name[-2:-1] != '_' and
+        len(name) > 2
+    )
+
+
+##
+
+
 def strip_with_newline(s: str) -> str:
     if not s:
         return ''
@@ -3000,27 +3021,6 @@ def split_keep_delimiter(s, d):
 ##
 
 
-def is_dunder(name: str) -> bool:
-    return (
-        name[:2] == name[-2:] == '__' and
-        name[2:3] != '_' and
-        name[-3:-2] != '_' and
-        len(name) > 4
-    )
-
-
-def is_sunder(name: str) -> bool:
-    return (
-        name[0] == name[-1] == '_' and
-        name[1:2] != '_' and
-        name[-2:-1] != '_' and
-        len(name) > 2
-    )
-
-
-##
-
-
 def attr_repr(obj: ta.Any, *attrs: str) -> str:
     return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
 
@@ -4970,11 +4970,26 @@ class ArgparseCli:
 
     #
 
-    async def async_cli_run(self) -> ta.Optional[int]:
+    async def async_cli_run(
+            self,
+            *,
+            force_async: bool = False,
+    ) -> ta.Optional[int]:
         if (fn := self.prepare_cli_run()) is None:
             return 0
 
-        return await fn()
+        if force_async:
+            is_async = True
+        else:
+            tfn = fn
+            if isinstance(tfn, ArgparseCmd):
+                tfn = tfn.fn
+            is_async = inspect.iscoroutinefunction(tfn)
+
+        if is_async:
+            return await fn()
+        else:
+            return fn()
 
 
 ########################################
@@ -10580,7 +10595,8 @@ class SystemInterpProvider(InterpProvider):
     async def get_exe_version(self, exe: str) -> ta.Optional[InterpVersion]:
         if not self._options.inspect:
             s = os.path.basename(exe)
-            s = s.removeprefix('python')
+            if s.startswith('python'):  # noqa
+                s = s[len('python'):]
             if '.' in s:
                 try:
                     return InterpVersion.parse(s)

ominfra/scripts/supervisor.py

@@ -2535,7 +2535,7 @@ def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
 ##
 
 
-def camel_case(name: str, lower: bool = False) -> str:
+def camel_case(name: str, *, lower: bool = False) -> str:
     if not name:
         return ''
     s = ''.join(map(str.capitalize, name.split('_')))  # noqa
@@ -2552,6 +2552,27 @@ def snake_case(name: str) -> str:
 ##
 
 
+def is_dunder(name: str) -> bool:
+    return (
+        name[:2] == name[-2:] == '__' and
+        name[2:3] != '_' and
+        name[-3:-2] != '_' and
+        len(name) > 4
+    )
+
+
+def is_sunder(name: str) -> bool:
+    return (
+        name[0] == name[-1] == '_' and
+        name[1:2] != '_' and
+        name[-2:-1] != '_' and
+        len(name) > 2
+    )
+
+
+##
+
+
 def strip_with_newline(s: str) -> str:
     if not s:
         return ''
@@ -2583,27 +2604,6 @@ def split_keep_delimiter(s, d):
 ##
 
 
-def is_dunder(name: str) -> bool:
-    return (
-        name[:2] == name[-2:] == '__' and
-        name[2:3] != '_' and
-        name[-3:-2] != '_' and
-        len(name) > 4
-    )
-
-
-def is_sunder(name: str) -> bool:
-    return (
-        name[0] == name[-1] == '_' and
-        name[1:2] != '_' and
-        name[-2:-1] != '_' and
-        len(name) > 2
-    )
-
-
-##
-
-
 def attr_repr(obj: ta.Any, *attrs: str) -> str:
     return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
 

ominfra/supervisor/main.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # ruff: noqa: UP006 UP007
 # @omlish-amalg ../scripts/supervisor.py
 #

{ominfra-0.0.0.dev209.dist-info → ominfra-0.0.0.dev211.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev209
+Version: 0.0.0.dev211
 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.dev209
-Requires-Dist: omlish==0.0.0.dev209
-Requires-Dist: omserv==0.0.0.dev209
+Requires-Dist: omdev==0.0.0.dev211
+Requires-Dist: omlish==0.0.0.dev211
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev209.dist-info → ominfra-0.0.0.dev211.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ominfra/.manifests.json,sha256=8KREXxMAlsilZOktXPYru1ND3V5hFI22vnrp6hT3bio,589
-ominfra/__about__.py,sha256=_gUs3H7uunGy5IfGw3mq4dFJWaF1mecSPruJPyjbs7Y,741
+ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/pyremote.py,sha256=qjY3Bj0GhuYznQ3bhqXmU9zyIVZkhD9Wv76QUG34ZME,15198
 ominfra/systemd.py,sha256=d61NVrJoItzSaqhMDgKGrQjbrxEVAujUMDsj8WggXos,1022
@@ -21,19 +21,19 @@ ominfra/clouds/aws/journald2aws/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxk
 ominfra/clouds/aws/journald2aws/__main__.py,sha256=d23loR_cKfTYZwYiqpt_CmKI7dd5WcYFgIYzqMep75E,68
 ominfra/clouds/aws/journald2aws/cursor.py,sha256=tQ7O6BHlEdaalbiI_Rqagj0aHfdtTQ_ZJwdOSRUjNvQ,1173
 ominfra/clouds/aws/journald2aws/driver.py,sha256=b3XfSlIBWAWJLImmyh1ZK9FpdNAYNZ2YZeCv_Q9GckM,6111
-ominfra/clouds/aws/journald2aws/main.py,sha256=4qWnw33cTPUW1CU4_9ojkn0wRStANrQzSI_cXpyuOf8,2202
+ominfra/clouds/aws/journald2aws/main.py,sha256=sqs_IoLzadv0EJoWHnYdgg3bkDDSFshCvyRWByTm8Sg,2179
 ominfra/clouds/aws/journald2aws/poster.py,sha256=hz1XuctW8GtLmfjhRvCFY6py52D4BzXHYny5XKFpHSA,2833
 ominfra/clouds/aws/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/clouds/aws/models/base.py,sha256=s2ffsIGOhRMhMY7awmordfrjWjvZGf5yeJJadt-tjEA,3287
+ominfra/clouds/aws/models/base.py,sha256=0VtlcRo4kbjdIOqikTe_cegViBHqb-DoqJSw_8eQZC4,3777
 ominfra/clouds/aws/models/gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/models/gen/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
 ominfra/clouds/aws/models/gen/cli.py,sha256=-tsjPPqUvXVqD40grn1Of-2-YF53dvCfISrIRI2AX4s,3869
-ominfra/clouds/aws/models/gen/gen.py,sha256=Z0bKHNbmVqcMdrtUjCWR9Dp5qBtfzP9mgEqcA7uw0ao,14010
+ominfra/clouds/aws/models/gen/gen.py,sha256=u4pfQCH9ir04zd3OPTeb6U3QaOuthM9FsCrJwMDCZB8,15189
 ominfra/clouds/aws/models/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/clouds/aws/models/services/ec2.py,sha256=wx1MlOyJSbYNwIWmmklex3JYbvY_teQZ_IfG-xwpztI,236248
-ominfra/clouds/aws/models/services/lambda_.py,sha256=FHxUTZownw_yGfFijPUKM9Ff0_oRNJGNVeSxgIdaCa0,23262
-ominfra/clouds/aws/models/services/rds.py,sha256=FNhaSR6rq3Xzlz16Aqp7e_HfejRrpxsnSJzH-tpUiuA,52509
-ominfra/clouds/aws/models/services/s3.py,sha256=KRKEeRS6cNmOIJm_J3YW5MohhpvLtMhxtD_5di0nfc4,45186
+ominfra/clouds/aws/models/services/ec2.py,sha256=TsJqFvX271BsBhCx18xg0bb-iXHoksZKT24lauZAchA,262063
+ominfra/clouds/aws/models/services/lambda_.py,sha256=LeAw6TmUwMLjB5VEYH1khWSmlSe6o_YhYjo7l2DXLFY,25766
+ominfra/clouds/aws/models/services/rds.py,sha256=T_V0qrdu3sUIfvk9coNu8OQLaP4BwDxyYaLp3xaeWEM,59730
+ominfra/clouds/aws/models/services/s3.py,sha256=g-3x1it0fk26psjDheInG-p308_ytTdOGMO-3SAlVV4,49431
 ominfra/clouds/aws/models/services/services.toml,sha256=njiWEctmUUrfzZh-aboCNP9BpYBpxGFAVaGvgtv3pMo,866
 ominfra/clouds/gcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/gcp/auth.py,sha256=rDIiOH5gP3OSIaMC5Lp8yAD4zWuLDEYlFu37mDx5YDA,1360
@@ -51,7 +51,7 @@ ominfra/manage/bootstrap.py,sha256=1RIRhVkUZjxZcZerHMg8U6xgWhhemGgPN5cDye8dQ68,4
 ominfra/manage/bootstrap_.py,sha256=B9UfR9J7mS3J54PFaSe1MQS5lCnKgxt5dDRJ9mnHYwg,656
 ominfra/manage/config.py,sha256=1y2N_8nXHBZc6YbW6BaRZoDDCTBmiHuWtTOQ7zdr5VE,184
 ominfra/manage/inject.py,sha256=_FVaMZUBKi-oObv14H77luWYCodxNJJD1t4pNQzckFE,2030
-ominfra/manage/main.py,sha256=1-PIAWnmd9XIy8pVcWGsME9xNTSj_t0sWWQTq9GYIzc,4403
+ominfra/manage/main.py,sha256=eZ2YpXlFaDxV_O5oNRKJ_6r5kS6GsQ0bQJflhxAIXDw,4380
 ominfra/manage/marshal.py,sha256=WKj7IU9bo4fBMSSzT6ZMm_WFalXIJZ-V7j8oi92fNhk,305
 ominfra/manage/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/commands/base.py,sha256=LtaI0AgnplttQK7gNncNItq8yuTZQimJTaprVpZktI8,3993
@@ -111,9 +111,9 @@ ominfra/manage/targets/connection.py,sha256=rVI1YJxFClcF-sdttqWyIz9_XjPI01GUdwxY
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=Bo_24qN3YI_72BcZYBHid9_SJWnCAmbKRJ3-wE6dGMU,166250
-ominfra/scripts/manage.py,sha256=QlG02s1uAJ4sFTRuR50HpinKp-B7-P0yAEHxikRonA0,357276
-ominfra/scripts/supervisor.py,sha256=6OQnZfnHfXT-hHsGQA_OhA_BjOs01vzInkmEZWYhiVY,291847
+ominfra/scripts/journald2aws.py,sha256=NDitI-4E4Joi0JiH60q_n45fRLweF40MtVQfotNbU2I,166253
+ominfra/scripts/manage.py,sha256=sb7uxZX6ovhMo0jyoem3halHN48mnobLBeIc8yzBRqg,357677
+ominfra/scripts/supervisor.py,sha256=WP1gthTsdQZZY4swRXGtPUrznnc1OYf25cs0m875YXk,291850
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -127,7 +127,7 @@ ominfra/supervisor/groupsimpl.py,sha256=PCDyc_Wc-pnvIj56_aEyiA5exCpK6n9iErqnJzO2
 ominfra/supervisor/http.py,sha256=Tl5eT6dyf4KuQXKbhGo1B6CFEzUDtPl_DZAuUFVD9zI,3453
 ominfra/supervisor/inject.py,sha256=IeR-WKvK1sGNxMe6G2OBT5kSP7EUP5ipkDgcUFmDPCA,4838
 ominfra/supervisor/io.py,sha256=moaGNaPuYXEAUzLg8Qjo05DEIcOUNYUj8SSr8eT0d24,3198
-ominfra/supervisor/main.py,sha256=--oFVmoCfJuyenet4u5x2pCv9rXbYuVxuUT5tnUQOPw,4404
+ominfra/supervisor/main.py,sha256=zCVuHZG2kGIPHwTLH4EUr5xpN4vJYessmKO2P0NE5RU,4381
 ominfra/supervisor/pipes.py,sha256=2ZihNTnRNjnIPOtPbm3_pyqO15f7BNs7WnNtO5V8ahM,2231
 ominfra/supervisor/privileges.py,sha256=kaRTHI7XjqzxEWCeHp3_0J0Vc4gSPugRbXEwxuw6MYE,2054
 ominfra/supervisor/process.py,sha256=UaubVxsxVqDnbuWVpTH0DTGbJGLO0vGJ9mNcvy2kCXM,217
@@ -155,9 +155,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev209.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev209.dist-info/METADATA,sha256=SqQycIG8tpaoacb0KsST3UuoYBcn7bdjI0UoIz2DVLo,767
-ominfra-0.0.0.dev209.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ominfra-0.0.0.dev209.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev209.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev209.dist-info/RECORD,,
+ominfra-0.0.0.dev211.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev211.dist-info/METADATA,sha256=wfG7Vql_zLWXluRFIsFxFOB8l26CL8uImcOsvKGFqe0,731
+ominfra-0.0.0.dev211.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ominfra-0.0.0.dev211.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev211.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev211.dist-info/RECORD,,