ominfra 0.0.0.dev170__py3-none-any.whl → 0.0.0.dev171__py3-none-any.whl

ominfra/manage/deploy/apps.py

@@ -1,6 +1,7 @@
 # ruff: noqa: UP006 UP007
 import datetime
 import os.path
+import shutil
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
@@ -142,6 +143,39 @@ class DeployAppManager(DeployPathOwner):
 
         #
 
+        def mirror_symlinks(src: str, dst: str) -> None:
+            def mirror_link(lp: str) -> None:
+                check.state(os.path.islink(lp))
+                shutil.copy2(
+                    lp,
+                    os.path.join(dst, os.path.relpath(lp, src)),
+                    follow_symlinks=False,
+                )
+
+            for dp, dns, fns in os.walk(src, followlinks=False):
+                for fn in fns:
+                    mirror_link(os.path.join(dp, fn))
+
+                for dn in dns:
+                    dp2 = os.path.join(dp, dn)
+                    if os.path.islink(dp2):
+                        mirror_link(dp2)
+                    else:
+                        os.makedirs(os.path.join(dst, os.path.relpath(dp2, src)))
+
+        current_link = os.path.join(deploy_home, 'deploys/current')
+        # if os.path.exists(current_link):
+        #     mirror_symlinks(
+        #         os.path.join(current_link, 'conf'),
+        #         conf_tag_dir,
+        #     )
+        #     mirror_symlinks(
+        #         os.path.join(current_link, 'apps'),
+        #         os.path.join(deploy_dir, 'apps'),
+        #     )
+
+        #
+
         git_dir = os.path.join(app_tag_dir, 'git')
         await self._git.checkout(
             spec.git,
@@ -171,5 +205,4 @@ class DeployAppManager(DeployPathOwner):
 
         #
 
-        current_link = os.path.join(deploy_home, 'deploys/current')
         os.replace(deploying_link, current_link)

ominfra/manage/remote/spawning.py

@@ -9,6 +9,7 @@ import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
+from omlish.lite.shlex import shlex_maybe_quote
 from omlish.subprocesses import SUBPROCESS_CHANNEL_OPTION_VALUES
 from omlish.subprocesses import SubprocessChannelOption
 
@@ -22,11 +23,14 @@ class RemoteSpawning(abc.ABC):
         shell: ta.Optional[str] = None
         shell_quote: bool = False
 
-        DEFAULT_PYTHON: ta.ClassVar[str] = 'python3'
-        python: str = DEFAULT_PYTHON
+        DEFAULT_PYTHON: ta.ClassVar[ta.Sequence[str]] = ('python3',)
+        python: ta.Sequence[str] = DEFAULT_PYTHON
 
         stderr: ta.Optional[str] = None  # SubprocessChannelOption
 
+        def __post_init__(self) -> None:
+            check.not_isinstance(self.python, str)
+
     @dc.dataclass(frozen=True)
     class Spawned:
         stdin: asyncio.StreamWriter
@@ -59,14 +63,18 @@ class SubprocessRemoteSpawning(RemoteSpawning):
             src: str,
     ) -> _PreparedCmd:
         if tgt.shell is not None:
-            sh_src = f'{tgt.python} -c {shlex.quote(src)}'
+            sh_src = ' '.join([
+                *map(shlex_maybe_quote, tgt.python),
+                '-c',
+                shlex_maybe_quote(src),
+            ])
             if tgt.shell_quote:
                 sh_src = shlex.quote(sh_src)
             sh_cmd = f'{tgt.shell} {sh_src}'
             return SubprocessRemoteSpawning._PreparedCmd([sh_cmd], shell=True)
 
         else:
-            return SubprocessRemoteSpawning._PreparedCmd([tgt.python, '-c', src], shell=False)
+            return SubprocessRemoteSpawning._PreparedCmd([*tgt.python, '-c', src], shell=False)
 
     #
 

ominfra/manage/targets/bestpython.py

@@ -0,0 +1,29 @@
+import io
+
+from omlish.lite.cached import cached_nullary
+from omlish.lite.resources import read_package_resource_text
+
+
+BEST_PYTHON_SH = read_package_resource_text(__package__, 'bestpython.sh')
+
+
+@cached_nullary
+def get_best_python_sh() -> str:
+    buf = io.StringIO()
+
+    for l in BEST_PYTHON_SH.strip().splitlines():
+        if not (l := l.strip()):
+            continue
+
+        buf.write(l)
+
+        if l.split()[-1] not in ('do', 'then', 'else'):
+            buf.write(';')
+
+        buf.write(' ')
+
+    return buf.getvalue().strip(' ;')
+
+
+if __name__ == '__main__':
+    print(__import__('shlex').quote(get_best_python_sh()))

ominfra/manage/targets/bestpython.sh

@@ -0,0 +1,21 @@
+bv=""
+bx=""
+
+for version in "" 3 3.{8..13}; do
+    x="python$version"
+    v=$($x -c "import sys; print(sys.version_info[:])" 2>/dev/null)
+    if [ $? -eq 0 ]; then
+        cv=$(echo $v | tr -d "(), ")
+        if [ -z "$bv" ] || [ "$cv" \> "$bv" ]; then
+            bv=$cv
+            bx=$x
+        fi
+    fi
+done
+
+if [ -z "$bx" ]; then
+    echo "no python" >&2
+    exit 1
+fi
+
+exec "$bx" "$@"

ominfra/manage/targets/connection.py

@@ -12,6 +12,7 @@ from ..commands.local import LocalCommandExecutor
 from ..remote.connection import InProcessRemoteExecutionConnector
 from ..remote.connection import PyremoteRemoteExecutionConnector
 from ..remote.spawning import RemoteSpawning
+from .bestpython import get_best_python_sh
 from .targets import DockerManageTarget
 from .targets import InProcessManageTarget
 from .targets import LocalManageTarget
@@ -28,6 +29,13 @@ class ManageTargetConnector(abc.ABC):
     def connect(self, tgt: ManageTarget) -> ta.AsyncContextManager[CommandExecutor]:
         raise NotImplementedError
 
+    def _default_python(self, python: ta.Optional[ta.Sequence[str]]) -> ta.Sequence[str]:
+        check.not_isinstance(python, str)
+        if python is not None:
+            return python
+        else:
+            return ['sh', '-c', get_best_python_sh(), '--']
+
 
 ##
 
@@ -79,7 +87,7 @@ class LocalManageTargetConnector(ManageTargetConnector):
         elif isinstance(lmt, SubprocessManageTarget):
             async with self._pyremote_connector.connect(
                     RemoteSpawning.Target(
-                        python=lmt.python,
+                        python=self._default_python(lmt.python),
                     ),
                     self._bootstrap,
             ) as rce:
@@ -112,7 +120,7 @@ class DockerManageTargetConnector(ManageTargetConnector):
         async with self._pyremote_connector.connect(
                 RemoteSpawning.Target(
                     shell=' '.join(sh_parts),
-                    python=dmt.python,
+                    python=self._default_python(dmt.python),
                 ),
                 self._bootstrap,
         ) as rce:
@@ -143,7 +151,7 @@ class SshManageTargetConnector(ManageTargetConnector):
                 RemoteSpawning.Target(
                     shell=' '.join(sh_parts),
                     shell_quote=True,
-                    python=smt.python,
+                    python=self._default_python(smt.python),
                 ),
                 self._bootstrap,
         ) as rce:

ominfra/manage/targets/targets.py

@@ -26,8 +26,11 @@ class ManageTarget(abc.ABC):  # noqa
 
 @dc.dataclass(frozen=True)
 class PythonRemoteManageTarget:
-    DEFAULT_PYTHON: ta.ClassVar[str] = 'python3'
-    python: str = DEFAULT_PYTHON
+    DEFAULT_PYTHON: ta.ClassVar[ta.Optional[ta.Sequence[str]]] = None
+    python: ta.Optional[ta.Sequence[str]] = DEFAULT_PYTHON
+
+    def __post_init__(self) -> None:
+        check.not_isinstance(self.python, str)
 
 
 #

ominfra/pyremote.py

@@ -256,11 +256,13 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
 
     bs_z = zlib.compress(bs_src.encode('utf-8'), 9)
     bs_z85 = base64.b85encode(bs_z).replace(b'\n', b'')
+    if b'"' in bs_z85:
+        raise ValueError(bs_z85)
 
     stmts = [
         f'import {", ".join(_PYREMOTE_BOOTSTRAP_IMPORTS)}',
-        f'exec(zlib.decompress(base64.b85decode({bs_z85!r})))',
-        f'_pyremote_bootstrap_main({context_name!r})',
+        f'exec(zlib.decompress(base64.b85decode(b"{bs_z85.decode("ascii")}")))',
+        f'_pyremote_bootstrap_main("{context_name}")',
     ]
 
     cmd = '; '.join(stmts)

ominfra/scripts/manage.py

@@ -26,6 +26,7 @@ import fractions
 import functools
 import hashlib
 import inspect
+import io
 import itertools
 import json
 import logging
@@ -1626,11 +1627,13 @@ def pyremote_build_bootstrap_cmd(context_name: str) -> str:
 
     bs_z = zlib.compress(bs_src.encode('utf-8'), 9)
     bs_z85 = base64.b85encode(bs_z).replace(b'\n', b'')
+    if b'"' in bs_z85:
+        raise ValueError(bs_z85)
 
     stmts = [
         f'import {", ".join(_PYREMOTE_BOOTSTRAP_IMPORTS)}',
-        f'exec(zlib.decompress(base64.b85decode({bs_z85!r})))',
-        f'_pyremote_bootstrap_main({context_name!r})',
+        f'exec(zlib.decompress(base64.b85decode(b"{bs_z85.decode("ascii")}")))',
+        f'_pyremote_bootstrap_main("{context_name}")',
     ]
 
     cmd = '; '.join(stmts)
@@ -2693,6 +2696,35 @@ def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
         todo.extend(reversed(cur.__subclasses__()))
 
 
+########################################
+# ../../../omlish/lite/resources.py
+
+
+def read_package_resource_binary(package: str, resource: str) -> bytes:
+    import importlib.resources
+    return importlib.resources.read_binary(package, resource)
+
+
+def read_package_resource_text(package: str, resource: str) -> str:
+    import importlib.resources
+    return importlib.resources.read_text(package, resource)
+
+
+########################################
+# ../../../omlish/lite/shlex.py
+
+
+def shlex_needs_quote(s: str) -> bool:
+    return bool(s) and len(list(shlex.shlex(s))) > 1
+
+
+def shlex_maybe_quote(s: str) -> str:
+    if shlex_needs_quote(s):
+        return shlex.quote(s)
+    else:
+        return s
+
+
 ########################################
 # ../../../omlish/lite/strings.py
 
@@ -4280,6 +4312,53 @@ def detect_system_platform() -> Platform:
     return platform
 
 
+########################################
+# ../targets/bestpython.py
+
+
+BEST_PYTHON_SH = """\
+bv=""
+bx=""
+
+for version in "" 3 3.{8..13}; do
+    x="python$version"
+    v=$($x -c "import sys; print(sys.version_info[:])" 2>/dev/null)
+    if [ $? -eq 0 ]; then
+        cv=$(echo $v | tr -d "(), ")
+        if [ -z "$bv" ] || [ "$cv" \\> "$bv" ]; then
+            bv=$cv
+            bx=$x
+        fi
+    fi
+done
+
+if [ -z "$bx" ]; then
+    echo "no python" >&2
+    exit 1
+fi
+
+exec "$bx" "$@"
+"""  # noqa
+
+
+@cached_nullary
+def get_best_python_sh() -> str:
+    buf = io.StringIO()
+
+    for l in BEST_PYTHON_SH.strip().splitlines():
+        if not (l := l.strip()):
+            continue
+
+        buf.write(l)
+
+        if l.split()[-1] not in ('do', 'then', 'else'):
+            buf.write(';')
+
+        buf.write(' ')
+
+    return buf.getvalue().strip(' ;')
+
+
 ########################################
 # ../targets/targets.py
 """
@@ -4303,8 +4382,11 @@ class ManageTarget(abc.ABC):  # noqa
 
 @dc.dataclass(frozen=True)
 class PythonRemoteManageTarget:
-    DEFAULT_PYTHON: ta.ClassVar[str] = 'python3'
-    python: str = DEFAULT_PYTHON
+    DEFAULT_PYTHON: ta.ClassVar[ta.Optional[ta.Sequence[str]]] = None
+    python: ta.Optional[ta.Sequence[str]] = DEFAULT_PYTHON
+
+    def __post_init__(self) -> None:
+        check.not_isinstance(self.python, str)
 
 
 #
@@ -8852,11 +8934,14 @@ class RemoteSpawning(abc.ABC):
         shell: ta.Optional[str] = None
         shell_quote: bool = False
 
-        DEFAULT_PYTHON: ta.ClassVar[str] = 'python3'
-        python: str = DEFAULT_PYTHON
+        DEFAULT_PYTHON: ta.ClassVar[ta.Sequence[str]] = ('python3',)
+        python: ta.Sequence[str] = DEFAULT_PYTHON
 
         stderr: ta.Optional[str] = None  # SubprocessChannelOption
 
+        def __post_init__(self) -> None:
+            check.not_isinstance(self.python, str)
+
     @dc.dataclass(frozen=True)
     class Spawned:
         stdin: asyncio.StreamWriter
@@ -8889,14 +8974,18 @@ class SubprocessRemoteSpawning(RemoteSpawning):
             src: str,
     ) -> _PreparedCmd:
         if tgt.shell is not None:
-            sh_src = f'{tgt.python} -c {shlex.quote(src)}'
+            sh_src = ' '.join([
+                *map(shlex_maybe_quote, tgt.python),
+                '-c',
+                shlex_maybe_quote(src),
+            ])
             if tgt.shell_quote:
                 sh_src = shlex.quote(sh_src)
             sh_cmd = f'{tgt.shell} {sh_src}'
             return SubprocessRemoteSpawning._PreparedCmd([sh_cmd], shell=True)
 
         else:
-            return SubprocessRemoteSpawning._PreparedCmd([tgt.python, '-c', src], shell=False)
+            return SubprocessRemoteSpawning._PreparedCmd([*tgt.python, '-c', src], shell=False)
 
     #
 
@@ -9348,6 +9437,39 @@ class DeployAppManager(DeployPathOwner):
 
         #
 
+        def mirror_symlinks(src: str, dst: str) -> None:
+            def mirror_link(lp: str) -> None:
+                check.state(os.path.islink(lp))
+                shutil.copy2(
+                    lp,
+                    os.path.join(dst, os.path.relpath(lp, src)),
+                    follow_symlinks=False,
+                )
+
+            for dp, dns, fns in os.walk(src, followlinks=False):
+                for fn in fns:
+                    mirror_link(os.path.join(dp, fn))
+
+                for dn in dns:
+                    dp2 = os.path.join(dp, dn)
+                    if os.path.islink(dp2):
+                        mirror_link(dp2)
+                    else:
+                        os.makedirs(os.path.join(dst, os.path.relpath(dp2, src)))
+
+        current_link = os.path.join(deploy_home, 'deploys/current')
+        # if os.path.exists(current_link):
+        #     mirror_symlinks(
+        #         os.path.join(current_link, 'conf'),
+        #         conf_tag_dir,
+        #     )
+        #     mirror_symlinks(
+        #         os.path.join(current_link, 'apps'),
+        #         os.path.join(deploy_dir, 'apps'),
+        #     )
+
+        #
+
         git_dir = os.path.join(app_tag_dir, 'git')
         await self._git.checkout(
             spec.git,
@@ -9377,7 +9499,6 @@ class DeployAppManager(DeployPathOwner):
 
         #
 
-        current_link = os.path.join(deploy_home, 'deploys/current')
         os.replace(deploying_link, current_link)
 
 
@@ -10225,6 +10346,13 @@ class ManageTargetConnector(abc.ABC):
     def connect(self, tgt: ManageTarget) -> ta.AsyncContextManager[CommandExecutor]:
         raise NotImplementedError
 
+    def _default_python(self, python: ta.Optional[ta.Sequence[str]]) -> ta.Sequence[str]:
+        check.not_isinstance(python, str)
+        if python is not None:
+            return python
+        else:
+            return ['sh', '-c', get_best_python_sh(), '--']
+
 
 ##
 
@@ -10276,7 +10404,7 @@ class LocalManageTargetConnector(ManageTargetConnector):
         elif isinstance(lmt, SubprocessManageTarget):
             async with self._pyremote_connector.connect(
                     RemoteSpawning.Target(
-                        python=lmt.python,
+                        python=self._default_python(lmt.python),
                     ),
                     self._bootstrap,
             ) as rce:
@@ -10309,7 +10437,7 @@ class DockerManageTargetConnector(ManageTargetConnector):
         async with self._pyremote_connector.connect(
                 RemoteSpawning.Target(
                     shell=' '.join(sh_parts),
-                    python=dmt.python,
+                    python=self._default_python(dmt.python),
                 ),
                 self._bootstrap,
         ) as rce:
@@ -10340,7 +10468,7 @@ class SshManageTargetConnector(ManageTargetConnector):
                 RemoteSpawning.Target(
                     shell=' '.join(sh_parts),
                     shell_quote=True,
-                    python=smt.python,
+                    python=self._default_python(smt.python),
                 ),
                 self._bootstrap,
         ) as rce:

{ominfra-0.0.0.dev170.dist-info → ominfra-0.0.0.dev171.dist-info}/METADATA

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

{ominfra-0.0.0.dev170.dist-info → ominfra-0.0.0.dev171.dist-info}/RECORD

@@ -3,7 +3,7 @@ ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/cmds.py,sha256=E0AfnvEmnKntXWvmLW5L05_NeDpBET1VBXn7vV6EwBQ,2083
 ominfra/configs.py,sha256=fUjGcYTZDyWcIF0BkHBxkGz64S33DR5NP8tHIf3IaXk,2291
-ominfra/pyremote.py,sha256=YK21mzMMQIpEUGQtUU7n8H8MeSIC5kwFcOXgKXPAZOE,15124
+ominfra/pyremote.py,sha256=HLfAZl3Xw5CpxLS5PS380zqCyE7n3vKVksIYT2Fbdc8,15197
 ominfra/ssh.py,sha256=jQpc4WvkMckIfk4vILda8zFaeharRqc_6wxW50b0OjQ,5431
 ominfra/threadworkers.py,sha256=oX4ubZn7h932saXpRIJu2MNhBExgGGMuGhdXarZxLJw,4948
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,7 @@ ominfra/manage/commands/ping.py,sha256=DVZFzL1Z_f-Bq53vxMrL3xOi0iK_nMonJE4KvQf9w
 ominfra/manage/commands/subprocess.py,sha256=yHGMbAI-xKe_9BUs5IZ3Yav8qRE-I9aGnBtTwW15Pnw,2440
 ominfra/manage/commands/types.py,sha256=XFZPeqeIBAaIIQF3pdPbGxLlb-LCrz6WtlDWO2q_vz0,210
 ominfra/manage/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/deploy/apps.py,sha256=HE2-ThrWR4wplT5hpPSQx0ERAkV-f58hj38al_FaZ7o,4457
+ominfra/manage/deploy/apps.py,sha256=O8iLGeldK48SQp8JkWSBEA93X5o-EuR9-f15wDj-1Bc,5567
 ominfra/manage/deploy/commands.py,sha256=fKFKhFwqIqC_PsgA-W66qIJ5S32xRgBBaRt3lbPX5Zg,763
 ominfra/manage/deploy/conf.py,sha256=AvIZFNuURpS0mKZazr36oBMKi4kJDeTlt74JZmDrpcA,5227
 ominfra/manage/deploy/config.py,sha256=aR6ubMEWqkTI55XtcG1Cczn6YhCVN6eSL8DT5EHQJN0,166
@@ -69,7 +69,7 @@ ominfra/manage/remote/connection.py,sha256=T4fL-GXXAfnbCbkZ3_28t8LAwwki4Td3j41eY
 ominfra/manage/remote/execution.py,sha256=_bygZi_0Uel615uIg43S14CTdmv1unEIu9TPz2mVRJ4,11738
 ominfra/manage/remote/inject.py,sha256=nSNP_VInCCZOWVrUIRHBvLmnM45geFoYmMh-zqc__as,1080
 ominfra/manage/remote/payload.py,sha256=Rn-Yo26POpHEOOfUHX3jWkqcQVEAvkJ_5Bu13jwoob4,944
-ominfra/manage/remote/spawning.py,sha256=dXfJE-T3WdM4ATDQxhbJ7N8xgN4FwDD-JsCrRTl297M,3027
+ominfra/manage/remote/spawning.py,sha256=CWeHBl4dzHLFLwJyFrt5hiAmhL0FaQzIYZ8j8EhI6VE,3301
 ominfra/manage/system/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/system/commands.py,sha256=XrYvsxiwTJh17buIWmoFGH8zTUIXmrXvYkLy1INtmkU,1173
 ominfra/manage/system/config.py,sha256=mEVBL1cy4twO6F0bdnCI01Sm0xuLe1Z5eiAzCvbmoAc,196
@@ -77,12 +77,14 @@ ominfra/manage/system/inject.py,sha256=Ksc7Xw_Yh3lWwkTRxB2JCeOYO-nMyKj-Kssd1RDkR
 ominfra/manage/system/packages.py,sha256=HImCsgzXxcfzAoD2PjrstaSE_qgBWtTFUVb0lTEOxkI,4614
 ominfra/manage/system/platforms.py,sha256=F0bgYzUzCjZ2LbWVvnEq2ya_X_LfRW406LQYFL7bG44,1202
 ominfra/manage/targets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/targets/connection.py,sha256=5e8h9Miej2DKJxZfLyxpGe8y-Y0V_b_AuUW159XVeJM,4643
+ominfra/manage/targets/bestpython.py,sha256=6_CH_Vm9Am5aD5UV3m8uC-B8bvMNSjVIWicPmFw0aLI,631
+ominfra/manage/targets/bestpython.sh,sha256=380kB4kdA1J2XZqcdmxNIOuxDP9ojtX-QSK3I6W85dM,392
+ominfra/manage/targets/connection.py,sha256=rVI1YJxFClcF-sdttqWyIz9_XjPI01GUdwxYck0P1PA,5016
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
-ominfra/manage/targets/targets.py,sha256=CFl8Uirgn3gfowO1Fn-LBK-6qYqEMFJ9snPUl0gCRuM,1753
+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=OjbemVx-zyCBuWZVgTky66n2-MfyyS7ups4A9hsvHfA,155684
-ominfra/scripts/manage.py,sha256=Xq28GDDorMsopZqYqZ240lcn1IFCHZi5-YOjZAEXVFY,306243
+ominfra/scripts/manage.py,sha256=p1Jl4so6Sz2oDJiR6t6Smv3QtE82X-OztYaXyqcyKZM,309660
 ominfra/scripts/supervisor.py,sha256=viYrsafRW5fLN2KUS1MtxCOm9CO4iOgIu60cmN3joSg,274450
 ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -125,9 +127,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=h6akQJMl0KuWLHS7Ur6WcBZ2JwF0DJQhsPTnFBdGyNk,3571
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev170.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev170.dist-info/METADATA,sha256=Jf1wa_IsisZtBKdGJalcUP8gK5eD-86j7V51LwcOOXU,731
-ominfra-0.0.0.dev170.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ominfra-0.0.0.dev170.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev170.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev170.dist-info/RECORD,,
+ominfra-0.0.0.dev171.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev171.dist-info/METADATA,sha256=4laS68lV28814KDlS884shBLi-scgN6KtxdwFokQMO0,731
+ominfra-0.0.0.dev171.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev171.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev171.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev171.dist-info/RECORD,,