ominfra 0.0.0.dev356__py3-none-any.whl → 0.0.0.dev357__py3-none-any.whl

ominfra/manage/commands/injection.py

@@ -11,6 +11,9 @@ from .base import CommandExecutorRegistration
 from .base import CommandRegistration
 
 
+##
+
+
 def bind_command(
         command_cls: ta.Type[Command],
         executor_cls: ta.Optional[ta.Type[CommandExecutor]],

ominfra/manage/commands/local.py

@@ -4,6 +4,9 @@ from .base import CommandExecutor
 from .types import CommandExecutorMap
 
 
+##
+
+
 class LocalCommandExecutor(CommandExecutor):
     def __init__(
             self,

ominfra/manage/commands/marshal.py

@@ -5,6 +5,9 @@ from .base import Command
 from .base import CommandNameMap
 
 
+##
+
+
 def install_command_marshaling(
         cmds: CommandNameMap,
         msh: ObjMarshalerManager,

ominfra/manage/commands/subprocess.py

@@ -28,13 +28,26 @@ class SubprocessCommand(Command['SubprocessCommand.Output']):
     env: ta.Optional[ta.Mapping[str, str]] = None
 
     stdout: str = 'pipe'  # SubprocessChannelOption
+    decode_stdout: ta.Optional[str] = None
+
     stderr: str = 'pipe'  # SubprocessChannelOption
+    decode_stderr: ta.Optional[str] = None
 
     input: ta.Optional[bytes] = None
+    encode_input: ta.Optional[str] = None
+    input_str: ta.Optional[str] = None
+
     timeout: ta.Optional[float] = None
 
     def __post_init__(self) -> None:
         check.not_isinstance(self.cmd, str)
+        check.state(not (self.input is not None and self.input_str is not None))
+        if self.decode_stdout is not None:
+            check.non_empty_str(self.decode_stdout)
+        if self.decode_stderr is not None:
+            check.non_empty_str(self.decode_stderr)
+        if self.encode_input is not None:
+            check.non_empty_str(self.encode_input)
 
     @dc.dataclass(frozen=True)
     class Output(Command.Output):
@@ -44,11 +57,25 @@ class SubprocessCommand(Command['SubprocessCommand.Output']):
         elapsed_s: float
 
         stdout: ta.Optional[bytes] = None
+        stdout_str: ta.Optional[str] = None
+
         stderr: ta.Optional[bytes] = None
+        stderr_str: ta.Optional[str] = None
 
 
 class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCommand.Output]):
+    DEFAULT_INPUT_ENCODING: ta.ClassVar[str] = 'utf-8'
+
     async def execute(self, cmd: SubprocessCommand) -> SubprocessCommand.Output:
+        input_bytes: ta.Optional[bytes]
+        if cmd.input is not None:
+            check.none(cmd.input_str)
+            input_bytes = cmd.input
+        elif cmd.input_str is not None:
+            input_bytes = cmd.input_str.encode(cmd.encode_input or self.DEFAULT_INPUT_ENCODING)
+        else:
+            input_bytes = None
+
         proc: asyncio.subprocess.Process
         async with asyncio_subprocesses.popen(
             *subprocess_maybe_shell_wrap_exec(*cmd.cmd),
@@ -57,7 +84,7 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
             cwd=cmd.cwd,
             env={**os.environ, **(cmd.env or {})},
 
-            stdin=subprocess.PIPE if cmd.input is not None else None,
+            stdin=subprocess.PIPE if input_bytes is not None else None,
             stdout=SUBPROCESS_CHANNEL_OPTION_VALUES[ta.cast(SubprocessChannelOption, cmd.stdout)],
             stderr=SUBPROCESS_CHANNEL_OPTION_VALUES[ta.cast(SubprocessChannelOption, cmd.stderr)],
 
@@ -66,17 +93,28 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
             start_time = time.time()
             stdout, stderr = await asyncio_subprocesses.communicate(
                 proc,
-                input=cmd.input,
+                input=input,
                 timeout=cmd.timeout,
             )
             end_time = time.time()
 
+        out_kw: ta.Dict[str, ta.Any] = {}
+        if stdout is not None:
+            if cmd.decode_stdout is not None:
+                out_kw.update(stdout_str=stdout.decode(cmd.decode_stdout))
+            else:
+                out_kw.update(stdout=stdout)
+        if stderr is not None:
+            if cmd.decode_stderr is not None:
+                out_kw.update(stderr_str=stderr.decode(cmd.decode_stderr))
+            else:
+                out_kw.update(stderr=stderr)
+
         return SubprocessCommand.Output(
             rc=check.not_none(proc.returncode),
             pid=proc.pid,
 
             elapsed_s=end_time - start_time,
 
-            stdout=stdout,  # noqa
-            stderr=stderr,  # noqa
+            **out_kw,
         )

ominfra/manage/deploy/apps.py

@@ -20,6 +20,9 @@ from .types import DeployHome
 from .venvs import DeployVenvManager
 
 
+##
+
+
 class DeployAppManager(DeployPathOwner):
     def __init__(
             self,

ominfra/manage/deploy/conf/inject.py

@@ -9,6 +9,9 @@ from ..injection import bind_deploy_manager
 from .manager import DeployConfManager
 
 
+##
+
+
 def bind_deploy_conf() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         bind_deploy_manager(DeployConfManager),

ominfra/manage/deploy/injection.py

@@ -5,6 +5,9 @@ from omlish.lite.inject import inj
 from .paths.owners import DeployPathOwner
 
 
+##
+
+
 def bind_deploy_manager(cls: type) -> InjectorBindings:
     return inj.as_bindings(
         inj.bind(cls, singleton=True),

ominfra/manage/deploy/nginx.py

@@ -4,5 +4,8 @@ verify - nginx -t
 """
 
 
+##
+
+
 class DeployNginxManager:
     pass

ominfra/manage/deploy/paths/inject.py

@@ -10,6 +10,9 @@ from .owners import DeployPathOwner
 from .owners import DeployPathOwners
 
 
+##
+
+
 def bind_deploy_paths() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(DeployPathOwner),

ominfra/manage/deploy/paths/manager.py

@@ -9,6 +9,9 @@ from .paths import DeployPath
 from .paths import DeployPathError
 
 
+##
+
+
 class DeployPathsManager:
     def __init__(
             self,

ominfra/manage/deploy/paths/owners.py

@@ -9,6 +9,9 @@ from ..types import DeployHome
 from .paths import DeployPath
 
 
+##
+
+
 class DeployPathOwner(abc.ABC):
     @abc.abstractmethod
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:

ominfra/manage/deploy/paths/specs.py

@@ -2,6 +2,9 @@
 from omlish.lite.check import check
 
 
+##
+
+
 def check_valid_deploy_spec_path(s: str) -> str:
     check.non_empty_str(s)
     for c in ['..', '//']:

ominfra/manage/deploy/systemd.py

@@ -22,6 +22,9 @@ from .tmp import DeployHomeAtomics
 from .types import DeployHome
 
 
+##
+
+
 class DeploySystemdManager:
     def __init__(
             self,

ominfra/manage/deploy/tmp.py

@@ -8,6 +8,9 @@ from .paths.owners import SingleDirDeployPathOwner
 from .types import DeployHome
 
 
+##
+
+
 class DeployHomeAtomics(Func1[DeployHome, AtomicPathSwapping]):
     pass
 

ominfra/manage/deploy/venvs.py

@@ -15,6 +15,9 @@ from omlish.lite.check import check
 from .specs import DeployVenvSpec
 
 
+##
+
+
 class DeployVenvManager:
     async def setup_venv(
             self,

ominfra/manage/remote/config.py

@@ -5,6 +5,9 @@ import typing as ta
 from omlish.lite.pycharm import PycharmRemoteDebug
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class RemoteConfig:
     payload_file: ta.Optional[str] = None

ominfra/manage/remote/connection.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import asyncio
 import contextlib
 import typing as ta

ominfra/manage/remote/payload.py

@@ -9,6 +9,9 @@ from omlish.lite.cached import cached_nullary
 RemoteExecutionPayloadFile = ta.NewType('RemoteExecutionPayloadFile', str)
 
 
+##
+
+
 @cached_nullary
 def _get_self_src() -> str:
     return inspect.getsource(sys.modules[__name__])

ominfra/manage/remote/spawning.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import asyncio
 import contextlib

ominfra/manage/system/config.py

@@ -5,6 +5,9 @@ import typing as ta
 from .platforms import Platform
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class SystemConfig:
     platform: ta.Optional[Platform] = None

ominfra/manage/system/inject.py

@@ -20,6 +20,9 @@ from .platforms import Platform
 from .platforms import detect_system_platform
 
 
+##
+
+
 def bind_system(
         *,
         system_config: SystemConfig,

ominfra/manage/system/packages.py

@@ -13,7 +13,10 @@ from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
 
 
-SystemPackageOrStr = ta.Union['SystemPackage', str]
+SystemPackageOrStr = ta.Union['SystemPackage', str]  # ta.TypeAlias
+
+
+##
 
 
 @dc.dataclass(frozen=True)

ominfra/manage/targets/connection.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import contextlib
 import dataclasses as dc

ominfra/pyremote.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 # @omlish-lite
 """
 Basically this: https://mitogen.networkgenomics.com/howitworks.html
@@ -438,15 +438,21 @@ class PyremoteBootstrapDriver:
         if isinstance(payload_src, str):
             parts = [payload_src]
         else:
-            parts = list(payload_src)
+            parts = []
+            for i, p in enumerate(payload_src):
+                if i:
+                    parts.append('\n\n')
+                parts.append(p)
 
         if (mn := options.main_name_override) is not None:
-            parts.insert(0, f'__name__ = {mn!r}')
+            # Must go on same single line as first line of user payload to preserve '<stdin>' line numbers. If more
+            # things wind up having to be done here, it can still be crammed on one line into a single `exec()`.
+            parts.insert(0, f'__name__ = {mn!r}; ')
 
         if len(parts) == 1:
             return parts[0]
         else:
-            return '\n\n'.join(parts)
+            return ''.join(parts)
 
     #
 

ominfra/scripts/journald2aws.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../clouds/aws/journald2aws/main.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 UP006 UP007 UP036 UP043 UP045
 import abc
 import argparse
 import base64

ominfra/scripts/manage.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../manage/main.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 TC003 UP006 UP007 UP036 UP043 UP045
 """
 manage.py -s 'docker run -i python:3.13'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
@@ -152,7 +152,7 @@ KeyDeployTagT = ta.TypeVar('KeyDeployTagT', bound='KeyDeployTag')
 SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias
 
 # system/packages.py
-SystemPackageOrStr = ta.Union['SystemPackage', str]
+SystemPackageOrStr = ta.Union['SystemPackage', str]  # ta.TypeAlias
 
 
 ########################################
@@ -1103,15 +1103,21 @@ class PyremoteBootstrapDriver:
         if isinstance(payload_src, str):
             parts = [payload_src]
         else:
-            parts = list(payload_src)
+            parts = []
+            for i, p in enumerate(payload_src):
+                if i:
+                    parts.append('\n\n')
+                parts.append(p)
 
         if (mn := options.main_name_override) is not None:
-            parts.insert(0, f'__name__ = {mn!r}')
+            # Must go on same single line as first line of user payload to preserve '<stdin>' line numbers. If more
+            # things wind up having to be done here, it can still be crammed on one line into a single `exec()`.
+            parts.insert(0, f'__name__ = {mn!r}; ')
 
         if len(parts) == 1:
             return parts[0]
         else:
-            return '\n\n'.join(parts)
+            return ''.join(parts)
 
     #
 
@@ -5062,6 +5068,9 @@ def build_command_name_map(crs: CommandRegistrations) -> CommandNameMap:
 # ../deploy/paths/specs.py
 
 
+##
+
+
 def check_valid_deploy_spec_path(s: str) -> str:
     check.non_empty_str(s)
     for c in ['..', '//']:
@@ -5074,6 +5083,9 @@ def check_valid_deploy_spec_path(s: str) -> str:
 # ../remote/config.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class RemoteConfig:
     payload_file: ta.Optional[str] = None
@@ -5098,6 +5110,9 @@ class RemoteConfig:
 RemoteExecutionPayloadFile = ta.NewType('RemoteExecutionPayloadFile', str)
 
 
+##
+
+
 @cached_nullary
 def _get_self_src() -> str:
     return inspect.getsource(sys.modules[__name__])
@@ -8310,17 +8325,10 @@ class Interp:
 
 
 ########################################
-# ../../../omdev/interp/uv/inject.py
-
-
-def bind_interp_uv() -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = []
-
-    return inj.as_bindings(*lst)
+# ../commands/injection.py
 
 
-########################################
-# ../commands/injection.py
+##
 
 
 def bind_command(
@@ -8344,6 +8352,9 @@ def bind_command(
 # ../commands/marshal.py
 
 
+##
+
+
 def install_command_marshaling(
         cmds: CommandNameMap,
         msh: ObjMarshalerManager,
@@ -8811,6 +8822,9 @@ class RemoteChannelImpl(RemoteChannel):
 # ../system/config.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class SystemConfig:
     platform: ta.Optional[Platform] = None
@@ -9127,6 +9141,9 @@ class MainBootstrap:
 # ../commands/local.py
 
 
+##
+
+
 class LocalCommandExecutor(CommandExecutor):
     def __init__(
             self,
@@ -10077,6 +10094,9 @@ class BaseSubprocesses(abc.ABC):  # noqa
 # ../../../omdev/interp/resolvers.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpResolverProviders:
     providers: ta.Sequence[ta.Tuple[str, InterpProvider]]
@@ -10413,6 +10433,9 @@ class DeployConfManager:
 # ../deploy/paths/owners.py
 
 
+##
+
+
 class DeployPathOwner(abc.ABC):
     @abc.abstractmethod
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
@@ -10926,6 +10949,9 @@ def git_shallow_clone(
 # ../deploy/injection.py
 
 
+##
+
+
 def bind_deploy_manager(cls: type) -> InjectorBindings:
     return inj.as_bindings(
         inj.bind(cls, singleton=True),
@@ -10938,6 +10964,9 @@ def bind_deploy_manager(cls: type) -> InjectorBindings:
 # ../deploy/paths/manager.py
 
 
+##
+
+
 class DeployPathsManager:
     def __init__(
             self,
@@ -10966,6 +10995,9 @@ class DeployPathsManager:
 # ../deploy/tmp.py
 
 
+##
+
+
 class DeployHomeAtomics(Func1[DeployHome, AtomicPathSwapping]):
     pass
 
@@ -11204,6 +11236,9 @@ asyncio_subprocesses = AsyncioSubprocesses()
 # ../../../omdev/interp/inspect.py
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class InterpInspection:
     exe: str
@@ -11313,6 +11348,9 @@ TODO:
 """
 
 
+##
+
+
 class Pyenv:
     def __init__(
             self,
@@ -11380,6 +11418,67 @@ class Pyenv:
         return True
 
 
+########################################
+# ../../../omdev/interp/uv/uv.py
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class UvConfig:
+    ignore_path: bool = False
+    pip_bootstrap: bool = True
+
+
+class Uv:
+    def __init__(
+            self,
+            config: UvConfig = UvConfig(),
+            *,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._config = config
+        self._log = log
+
+        self._bootstrap_dir: ta.Optional[str] = None
+
+    def delete_bootstrap_dir(self) -> bool:
+        if (bs := self._bootstrap_dir) is None:
+            return False
+
+        shutil.rmtree(bs)
+        self._bootstrap_dir = None
+        return True
+
+    @async_cached_nullary
+    async def uv_exe(self) -> ta.Optional[str]:
+        if not self._config.ignore_path and (uv := shutil.which('uv')):
+            return uv
+
+        if self._config.pip_bootstrap:
+            if (bd := self._bootstrap_dir) is None:
+                bd = self._bootstrap_dir = tempfile.mkdtemp()
+
+            if self._log is not None:
+                self._log.info(f'Bootstrapping uv into %s', bd)
+
+            vn = 'uv-bootstrap'
+            await asyncio_subprocesses.check_call(os.path.realpath(sys.executable), '-m', 'venv', vn, cwd=bd)
+
+            vx = os.path.join(bd, vn, 'bin', 'python3')
+            await asyncio_subprocesses.check_call(vx, '-m', 'pip', 'install', 'uv', cwd=bd)
+
+            ux = os.path.join(bd, vn, 'bin', 'uv')
+            check.state(os.path.isfile(ux))
+
+            return ux
+
+        return None
+
+
 ########################################
 # ../commands/subprocess.py
 
@@ -11396,13 +11495,26 @@ class SubprocessCommand(Command['SubprocessCommand.Output']):
     env: ta.Optional[ta.Mapping[str, str]] = None
 
     stdout: str = 'pipe'  # SubprocessChannelOption
+    decode_stdout: ta.Optional[str] = None
+
     stderr: str = 'pipe'  # SubprocessChannelOption
+    decode_stderr: ta.Optional[str] = None
 
     input: ta.Optional[bytes] = None
+    encode_input: ta.Optional[str] = None
+    input_str: ta.Optional[str] = None
+
     timeout: ta.Optional[float] = None
 
     def __post_init__(self) -> None:
         check.not_isinstance(self.cmd, str)
+        check.state(not (self.input is not None and self.input_str is not None))
+        if self.decode_stdout is not None:
+            check.non_empty_str(self.decode_stdout)
+        if self.decode_stderr is not None:
+            check.non_empty_str(self.decode_stderr)
+        if self.encode_input is not None:
+            check.non_empty_str(self.encode_input)
 
     @dc.dataclass(frozen=True)
     class Output(Command.Output):
@@ -11412,11 +11524,25 @@ class SubprocessCommand(Command['SubprocessCommand.Output']):
         elapsed_s: float
 
         stdout: ta.Optional[bytes] = None
+        stdout_str: ta.Optional[str] = None
+
         stderr: ta.Optional[bytes] = None
+        stderr_str: ta.Optional[str] = None
 
 
 class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCommand.Output]):
+    DEFAULT_INPUT_ENCODING: ta.ClassVar[str] = 'utf-8'
+
     async def execute(self, cmd: SubprocessCommand) -> SubprocessCommand.Output:
+        input_bytes: ta.Optional[bytes]
+        if cmd.input is not None:
+            check.none(cmd.input_str)
+            input_bytes = cmd.input
+        elif cmd.input_str is not None:
+            input_bytes = cmd.input_str.encode(cmd.encode_input or self.DEFAULT_INPUT_ENCODING)
+        else:
+            input_bytes = None
+
         proc: asyncio.subprocess.Process
         async with asyncio_subprocesses.popen(
             *subprocess_maybe_shell_wrap_exec(*cmd.cmd),
@@ -11425,7 +11551,7 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
             cwd=cmd.cwd,
             env={**os.environ, **(cmd.env or {})},
 
-            stdin=subprocess.PIPE if cmd.input is not None else None,
+            stdin=subprocess.PIPE if input_bytes is not None else None,
             stdout=SUBPROCESS_CHANNEL_OPTION_VALUES[ta.cast(SubprocessChannelOption, cmd.stdout)],
             stderr=SUBPROCESS_CHANNEL_OPTION_VALUES[ta.cast(SubprocessChannelOption, cmd.stderr)],
 
@@ -11434,19 +11560,30 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
             start_time = time.time()
             stdout, stderr = await asyncio_subprocesses.communicate(
                 proc,
-                input=cmd.input,
+                input=input,
                 timeout=cmd.timeout,
             )
             end_time = time.time()
 
+        out_kw: ta.Dict[str, ta.Any] = {}
+        if stdout is not None:
+            if cmd.decode_stdout is not None:
+                out_kw.update(stdout_str=stdout.decode(cmd.decode_stdout))
+            else:
+                out_kw.update(stdout=stdout)
+        if stderr is not None:
+            if cmd.decode_stderr is not None:
+                out_kw.update(stderr_str=stderr.decode(cmd.decode_stderr))
+            else:
+                out_kw.update(stderr=stderr)
+
         return SubprocessCommand.Output(
             rc=check.not_none(proc.returncode),
             pid=proc.pid,
 
             elapsed_s=end_time - start_time,
 
-            stdout=stdout,  # noqa
-            stderr=stderr,  # noqa
+            **out_kw,
         )
 
 
@@ -11454,6 +11591,9 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
 # ../deploy/conf/inject.py
 
 
+##
+
+
 def bind_deploy_conf() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         bind_deploy_manager(DeployConfManager),
@@ -11654,6 +11794,9 @@ class DeployGitManager(SingleDirDeployPathOwner):
 # ../deploy/paths/inject.py
 
 
+##
+
+
 def bind_deploy_paths() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(DeployPathOwner),
@@ -11677,6 +11820,9 @@ TODO:
 """
 
 
+##
+
+
 class DeploySystemdManager:
     def __init__(
             self,
@@ -11902,6 +12048,9 @@ TODO:
 """
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class SystemPackage:
     name: str
@@ -12020,6 +12169,9 @@ class YumSystemPackageManager(SystemPackageManager):
 # ../../../omdev/interp/providers/running.py
 
 
+##
+
+
 class RunningInterpProvider(InterpProvider):
     @cached_nullary
     def version(self) -> InterpVersion:
@@ -12426,6 +12578,40 @@ class PyenvVersionInstaller:
         return exe
 
 
+########################################
+# ../../../omdev/interp/uv/provider.py
+"""
+uv run pip
+uv run --python 3.11.6 pip
+uv venv --python 3.11.6 --seed barf
+python3 -m venv barf && barf/bin/pip install uv && barf/bin/uv venv --python 3.11.6 --seed barf2
+"""
+
+
+##
+
+
+class UvInterpProvider(InterpProvider):
+    def __init__(
+            self,
+            *,
+            pyenv: Uv,
+            inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._pyenv = pyenv
+        self._inspector = inspector
+        self._log = log
+
+    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        return []
+
+    async def get_installed_version(self, version: InterpVersion) -> Interp:
+        raise NotImplementedError
+
+
 ########################################
 # ../commands/inject.py
 
@@ -12666,6 +12852,9 @@ class CheckSystemPackageCommandExecutor(CommandExecutor[CheckSystemPackageComman
 # ../../../omdev/interp/providers/inject.py
 
 
+##
+
+
 def bind_interp_providers() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(InterpProvider),
@@ -12685,6 +12874,9 @@ def bind_interp_providers() -> InjectorBindings:
 # ../../../omdev/interp/pyenv/provider.py
 
 
+##
+
+
 class PyenvInterpProvider(InterpProvider):
     @dc.dataclass(frozen=True)
     class Options:
@@ -12812,6 +13004,24 @@ class PyenvInterpProvider(InterpProvider):
         return Interp(exe, version)
 
 
+########################################
+# ../../../omdev/interp/uv/inject.py
+
+
+##
+
+
+def bind_interp_uv() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(Uv, singleton=True),
+
+        inj.bind(UvInterpProvider, singleton=True),
+        inj.bind(InterpProvider, to_key=UvInterpProvider, array=True),
+    ]
+
+    return inj.as_bindings(*lst)
+
+
 ########################################
 # ../remote/inject.py
 
@@ -12844,6 +13054,9 @@ def bind_remote(
 # ../system/inject.py
 
 
+##
+
+
 def bind_system(
         *,
         system_config: SystemConfig,
@@ -13033,6 +13246,9 @@ class SshManageTargetConnector(ManageTargetConnector):
 # ../../../omdev/interp/pyenv/inject.py
 
 
+##
+
+
 def bind_interp_pyenv() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(Pyenv, singleton=True),
@@ -13077,6 +13293,9 @@ def bind_targets() -> InjectorBindings:
 # ../../../omdev/interp/inject.py
 
 
+##
+
+
 def bind_interp() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         bind_interp_providers(),
@@ -13096,6 +13315,7 @@ def bind_interp() -> InjectorBindings:
             injector.provide(c)
             for c in [
                 PyenvInterpProvider,
+                UvInterpProvider,
                 RunningInterpProvider,
                 SystemInterpProvider,
             ]
@@ -13118,6 +13338,9 @@ def bind_interp() -> InjectorBindings:
 # ../../../omdev/interp/default.py
 
 
+##
+
+
 @cached_nullary
 def get_default_interp_resolver() -> InterpResolver:
     return inj.create_injector(bind_interp())[InterpResolver]
@@ -13162,6 +13385,9 @@ TODO:
 """
 
 
+##
+
+
 class DeployVenvManager:
     async def setup_venv(
             self,
@@ -13207,6 +13433,9 @@ class DeployVenvManager:
 # ../deploy/apps.py
 
 
+##
+
+
 class DeployAppManager(DeployPathOwner):
     def __init__(
             self,

ominfra/scripts/supervisor.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../supervisor/main.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 UP006 UP007 UP012 UP036 UP045
+# ruff: noqa: N802 UP006 UP007 UP012 UP036 UP043 UP045
 #
 # Supervisor is Copyright (c) 2006-2015 Agendaless Consulting and Contributors.
 # (http://www.agendaless.com), All Rights Reserved

{ominfra-0.0.0.dev356.dist-info → ominfra-0.0.0.dev357.dist-info}/METADATA

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

{ominfra-0.0.0.dev356.dist-info → ominfra-0.0.0.dev357.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ominfra/.manifests.json,sha256=8KREXxMAlsilZOktXPYru1ND3V5hFI22vnrp6hT3bio,589
 ominfra/__about__.py,sha256=Cb4OinET2BZACWkjdR97ihmUdjDcQBe_qF2VcJ0tey4,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote.py,sha256=vdeIbvuqIXfiPPVmsD-eb-HSL6yStvVQ9MIwYJI1XT4,16168
+ominfra/pyremote.py,sha256=hCoh0m-yxAoHOTB_tG8nwqq_CEXxIF0MTZ0A5eaZcSM,16529
 ominfra/systemd.py,sha256=-tk4qeQF9py98AtK5VVGYwcgQ_mJPanEWbemoU-nmbY,1028
 ominfra/threadworkers.py,sha256=We6wkoq-cd0DRAxS0z5bUXQKtSwwfcHNZqRuIU57doU,4980
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,64 +57,64 @@ 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=8wXSlvihd4GBwYa05HZ9QD2-uiH7dUqEG0uP6flxuJQ,3999
 ominfra/manage/commands/inject.py,sha256=ixQVuKN808dTSqHp5V-MUIgDHw5jVei8BnEy-bE4tDY,2960
-ominfra/manage/commands/injection.py,sha256=GcchG_-pzFb09b159SKdcjFcGpPusP2x-eFAfqsw59s,841
-ominfra/manage/commands/local.py,sha256=3zQ_Y7j4DfZAP4gNS9FbbV7Vkylw8ifglVWBM3qxh8k,538
-ominfra/manage/commands/marshal.py,sha256=Xl_yRgCD94yDmAx6e2uKVRjkmhV5EOr-Akqo3C0DGXw,689
+ominfra/manage/commands/injection.py,sha256=6jVPO2mhaorVfe7vAv8EQQSkxgEZhu-NZHpK37JlKc0,846
+ominfra/manage/commands/local.py,sha256=dESeaFeQAiWMCx62wfaqbJlJF6kALKi6Fzy1M5H-H3A,543
+ominfra/manage/commands/marshal.py,sha256=k3MmlHy4ibQjaZwMNcjvjjMsjdegn0XWTnJ6XLSDJ2c,694
 ominfra/manage/commands/ping.py,sha256=DVZFzL1Z_f-Bq53vxMrL3xOi0iK_nMonJE4KvQf9wsI,546
-ominfra/manage/commands/subprocess.py,sha256=4GSKrozxp2RosO71FjAaTUySSDEWrEclPq7ATZF2ATc,2461
+ominfra/manage/commands/subprocess.py,sha256=UjoZA_csQ5ksb1ZPSByP9noS5920DOvQg1SqDBxFusg,3892
 ominfra/manage/commands/types.py,sha256=tEufI13T1j1Ji2p2APNpPfBz4pFI2KiFv5ady9UXdXI,216
 ominfra/manage/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/deploy/apps.py,sha256=2DiuXPBr9RB2gS45sA3gP4Y7AoReABP-gQlIiXvXYMg,4871
+ominfra/manage/deploy/apps.py,sha256=PcBkx-3PGTdP7kpKD2Sk401HljQVcHcrAbXfP4dh0G8,4876
 ominfra/manage/deploy/commands.py,sha256=gGrw7JNkPrxAh_x5-ih1_XG6kGhoqPwRD1wjdaNUSR8,836
 ominfra/manage/deploy/config.py,sha256=EsDzSvUzNrFT32tL53xIY2MSKstTrf-L7sBtedYAlDw,120
 ominfra/manage/deploy/deploy.py,sha256=naI0vH5MQNiSu3go9y35k-C9rGUfvz_V246oJ_HOUr8,8972
 ominfra/manage/deploy/git.py,sha256=D3mdEM5LifnAfAVPVwAIZYc5X0A4A7lyF46diheqBW8,5539
 ominfra/manage/deploy/inject.py,sha256=el2GPkY7uV_2_PIlMwT9FnY-QGQQPUL8U3OzR0bvh1o,3478
-ominfra/manage/deploy/injection.py,sha256=WbxBu7K7P2Wvp_p-BYhujSC2B9UhwhOjPYxLvfhDrX4,398
+ominfra/manage/deploy/injection.py,sha256=88zkzgtAY2Rg6qaXqSa555W7RMMYglWXdfZNlKs2a4Q,403
 ominfra/manage/deploy/interp.py,sha256=IRM-_r1PWtcrjennC02jbWF6xWsBhxDMQG_6bJ6o3v0,1043
-ominfra/manage/deploy/nginx.py,sha256=Ee-j2vxjIwpZXRr6anr7wj2GuhzAQwQ6MO67XUH60zU,95
+ominfra/manage/deploy/nginx.py,sha256=L_1txY0z4HPAXjz9qkjwM8gT1X16zKCq77Nfp5_F79k,100
 ominfra/manage/deploy/specs.py,sha256=q3_tfzkVB6bXQ4cNobIRTYoSPFCUFAo_4R71nL9tPfE,2899
-ominfra/manage/deploy/systemd.py,sha256=PS1k3Wc7iFaLISJdKw2s_F5lMEdNfwEqFh-aVVwYXDo,3618
+ominfra/manage/deploy/systemd.py,sha256=5P8QTJ0Oa1PBDja8oljfmaQBetObS1bD9QkwsWNOiuc,3623
 ominfra/manage/deploy/tags.py,sha256=Z0uIbiEEGxWtqytMR6QyAquBDRtQBT0apNZB3kHj2Z4,5124
-ominfra/manage/deploy/tmp.py,sha256=KcFl_NY3CKB8uI2S1h82vt5TQXTdE6qQWJGKKm1As1Q,735
+ominfra/manage/deploy/tmp.py,sha256=E-59X9KzV4wXXNr7J4_NbRX8N5EPOo7KL-hRw9pZ6yY,740
 ominfra/manage/deploy/types.py,sha256=ZcIoheZ3zW7n0IZiqTRW_Uo3JyWWeWg5nyKGryvGc2I,112
-ominfra/manage/deploy/venvs.py,sha256=tA82cxD68OOqXBf99IldlFv2vWBvS-rL9wR90TefcAc,1702
+ominfra/manage/deploy/venvs.py,sha256=QES260A0QbX1YIY7cXxFbSlzXcWGfH05cilZ3fEx0CE,1707
 ominfra/manage/deploy/conf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/deploy/conf/inject.py,sha256=V9ISuvRCu0X5TqrmBjhRnCNZ5vHaTek8FwCr8tkCBtI,459
+ominfra/manage/deploy/conf/inject.py,sha256=MWN56HbSBK57WrU4nznJk4lJbQjM4NKwp6VhlKmiqac,464
 ominfra/manage/deploy/conf/manager.py,sha256=ktLS1sAuVVR0quevr3tEc77q6shGuAcBSmfYO4YHPEw,8328
 ominfra/manage/deploy/conf/specs.py,sha256=KwvppmSpAL-ieTk4zOF85wCJovMypAHTMv7daEvnahA,2197
 ominfra/manage/deploy/paths/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/deploy/paths/inject.py,sha256=zDMEncGA8e5NtiqdDmuG7fMSbK94VR6Um4GgBqDZ664,602
-ominfra/manage/deploy/paths/manager.py,sha256=t29go-6lPMFsiRiWv-x49IpjbVIV3bWDVg6L3_fnItc,935
-ominfra/manage/deploy/paths/owners.py,sha256=F-2evqFoGjze_HXHWJgga4LLwbXTL5DxNswtLZlKwpU,1235
+ominfra/manage/deploy/paths/inject.py,sha256=WZarL7SizE3GR1n1atHXeudBXd2A4R_2-w6iPWuXkG0,607
+ominfra/manage/deploy/paths/manager.py,sha256=RRgMPJ9gMrEFsU0Dezbls45M6kjmvKzAqRo9vmDWj-w,940
+ominfra/manage/deploy/paths/owners.py,sha256=Cb_80BBrsUo6Rm0tWTljjEScoCHL0PWbLGvWlvqBZl8,1240
 ominfra/manage/deploy/paths/paths.py,sha256=8_RVgHctv_Lj4v7FjxMDSXcayXaIo_CRMwhIBRUQ2iQ,5643
-ominfra/manage/deploy/paths/specs.py,sha256=bmGD9OsWL1VvzTPTeDoB8HEE0fYFfSU246ocUOFjVoo,250
+ominfra/manage/deploy/paths/specs.py,sha256=HDP1XLKHJx1NwpJZuGikirmkHoFPYHX6Myn_Vd03CVQ,255
 ominfra/manage/deploy/paths/types.py,sha256=WyQA5DlM5vKZnGXZouunuLTPl3KV7ktaez_sqoC5clY,118
 ominfra/manage/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/remote/_main.py,sha256=UIp_Xalp8FP-p1cSe3uO7TPJrJEUnbPrNWIZRJDmg-s,4362
 ominfra/manage/remote/channel.py,sha256=6eYzQfmTRN4nvQyFOt37EKPjUQ10Bbu8d6Zq4cpWhNc,2230
-ominfra/manage/remote/config.py,sha256=4IvyRgQY6OkmPCFP0BXWwMr3iaZbVF56ZH8z3X5oH4I,479
-ominfra/manage/remote/connection.py,sha256=1Q6a96oTZuMzZzbvRnbqVTSLp2TNKJFK_twHMi3WTiw,3801
+ominfra/manage/remote/config.py,sha256=0tgfTJKa2Cy2nzl2j3allYyMIEsAwhIlF02v9ke-990,484
+ominfra/manage/remote/connection.py,sha256=vciH5wtzXN7g-B6hlR97m886YSflbnDASLUDjz5mq7Q,3807
 ominfra/manage/remote/execution.py,sha256=0r34APS4YYvUqWijBQa3HizoNJ5U9PAdu5L9mSHPrsE,11744
 ominfra/manage/remote/inject.py,sha256=7upiQPMa_JkcdHgYyJjmbppIy3E2ne7IxJ_EZuIQllQ,1086
-ominfra/manage/remote/payload.py,sha256=Rfkha76G23Lh2kvYc3oWRCfyMyuXLheN9-jwMNhl6sA,950
-ominfra/manage/remote/spawning.py,sha256=Oq9sUmOXx6eIOuU5dSqq6UDAFL8XdmItyMjObvgYC_Q,3312
+ominfra/manage/remote/payload.py,sha256=QVNz7bBBWKLdXPuIGfQ0FW1rWE8nrBEE5Q9cLgF8FwU,955
+ominfra/manage/remote/spawning.py,sha256=jjReGjsW4MWq5wecrPBLg-4leCVeris04HvctWTnegA,3318
 ominfra/manage/system/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/system/commands.py,sha256=VN-nthJB4LYwsDvPNmc_mYe4XyWnStAi7SLZGaEPZCA,1179
-ominfra/manage/system/config.py,sha256=gn7oImD1sXDVrJusSCuLnWo6qzlA4iq3ZtiwsVMtpTA,202
-ominfra/manage/system/inject.py,sha256=2HwR0n5zgK6HQWqO_M_-1S4iyJ7YoFkygqhU-QAjmuc,1880
-ominfra/manage/system/packages.py,sha256=qvU7jKFr5ChoMoKs_9aoc-rtSOIwUZ-OzrytTFXzXZE,4620
+ominfra/manage/system/config.py,sha256=Ql-kCV4BVsgmMh08SrxJ7YW-BCLviOJM-cpoZ2gBIL0,207
+ominfra/manage/system/inject.py,sha256=i1yCAnmhN_mUe9CY2YdNT0GBipo7WED_vncWbZFvF3c,1885
+ominfra/manage/system/packages.py,sha256=xe_JNv5rTPlqKGfkiB9iDmH-bAEdvQ0yeFiY6mPVTKc,4641
 ominfra/manage/system/platforms.py,sha256=F0bgYzUzCjZ2LbWVvnEq2ya_X_LfRW406LQYFL7bG44,1202
 ominfra/manage/targets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/targets/bestpython.py,sha256=6_CH_Vm9Am5aD5UV3m8uC-B8bvMNSjVIWicPmFw0aLI,631
 ominfra/manage/targets/bestpython.sh,sha256=RTvImgsRv-67D9Ugg5bo7NfpV2MD8zTsLt6aipdLQiQ,350
-ominfra/manage/targets/connection.py,sha256=a5gIe9MIQi2q_JTNAVbO4kZMresWglC4TvOA1RrYYcg,5022
+ominfra/manage/targets/connection.py,sha256=Ut-R_PvQN9tPBacZD0ODmLIYvLsgS51qvOGrNgAyiEo,5028
 ominfra/manage/targets/inject.py,sha256=WhkEAB5BFWtENnVMmuiy9eoBNd6jBPSGZsWjT_9_7JA,1567
 ominfra/manage/targets/targets.py,sha256=WmasYmL6xfAI7F0XvDhScFdBVxkqPkmo_gRgABmmkGA,1891
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=7bZWgNeZuTAs6fBl4XBApOfJt4pg_iykoUsjuzX29wc,171893
-ominfra/scripts/manage.py,sha256=Jm6-X8kVySJv5fVj6sIwJa4V8tEOhyfYCAc7lw89Tyk,385567
-ominfra/scripts/supervisor.py,sha256=lvYjMMIxM32xehKBWTqLFAi5Ee6rYimc33QTKvM2SxQ,304398
+ominfra/scripts/journald2aws.py,sha256=qV9yL8xZSPd2Ec2ZY67rhGQQ9ZzeOafuwu9cBALQVik,171899
+ominfra/scripts/manage.py,sha256=8oZbE87PcWLbUKtiKEQRIMQsg2RYeGr-uP_vhgu64Ac,390105
+ominfra/scripts/supervisor.py,sha256=xF-GynxXERKfUkP9P_AREDt4Ggxj5MTiNgiz-FJkK6I,304404
 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=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=zRV7-tKB7kBah1oTVZlol-vwx1FBlnfzYAPGkeU5jX4,3543
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev356.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev356.dist-info/METADATA,sha256=GAr7_DGY3nWzucTryV-ydildvowNOFO6EXNHMdD-tUg,753
-ominfra-0.0.0.dev356.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ominfra-0.0.0.dev356.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev356.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev356.dist-info/RECORD,,
+ominfra-0.0.0.dev357.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev357.dist-info/METADATA,sha256=OPD_Ml1F-Or7UJT4H-uvQWNPglktwUfpIzlcSJw0GZM,753
+ominfra-0.0.0.dev357.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ominfra-0.0.0.dev357.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev357.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev357.dist-info/RECORD,,