ominfra 0.0.0.dev170__tar.gz → 0.0.0.dev171__tar.gz

{ominfra-0.0.0.dev170/ominfra.egg-info → ominfra-0.0.0.dev171}/PKG-INFO

@@ -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 → ominfra-0.0.0.dev171}/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-0.0.0.dev170 → ominfra-0.0.0.dev171}/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-0.0.0.dev171/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-0.0.0.dev171/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-0.0.0.dev170 → ominfra-0.0.0.dev171}/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-0.0.0.dev170 → ominfra-0.0.0.dev171}/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-0.0.0.dev170 → ominfra-0.0.0.dev171}/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-0.0.0.dev170 → ominfra-0.0.0.dev171}/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 → ominfra-0.0.0.dev171/ominfra.egg-info}/PKG-INFO

@@ -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 → ominfra-0.0.0.dev171}/ominfra.egg-info/SOURCES.txt

@@ -87,6 +87,8 @@ ominfra/manage/system/inject.py
 ominfra/manage/system/packages.py
 ominfra/manage/system/platforms.py
 ominfra/manage/targets/__init__.py
+ominfra/manage/targets/bestpython.py
+ominfra/manage/targets/bestpython.sh
 ominfra/manage/targets/connection.py
 ominfra/manage/targets/inject.py
 ominfra/manage/targets/targets.py

{ominfra-0.0.0.dev170 → ominfra-0.0.0.dev171}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev170
-omlish==0.0.0.dev170
+omdev==0.0.0.dev171
+omlish==0.0.0.dev171
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev170 → ominfra-0.0.0.dev171}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev170'
+version = '0.0.0.dev171'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev170',
-    'omlish == 0.0.0.dev170',
+    'omdev == 0.0.0.dev171',
+    'omlish == 0.0.0.dev171',
 ]
 
 [project.optional-dependencies]
@@ -61,4 +61,5 @@ exclude = [
     '.manifests.json',
     'LICENSE',
     'LICENSE.txt',
+    'manage/targets/bestpython.sh',
 ]