ominfra 0.0.0.dev181__py3-none-any.whl → 0.0.0.dev183__py3-none-any.whl

ominfra/scripts/manage.py

@@ -129,6 +129,7 @@ AtomicPathSwapState = ta.Literal['open', 'committed', 'aborted']  # ta.TypeAlias
 
 # ../configs.py
 ConfigMapping = ta.Mapping[str, ta.Any]
+IniConfigSectionSettingsMap = ta.Mapping[str, ta.Mapping[str, ta.Union[str, ta.Sequence[str]]]]  # ta.TypeAlias
 
 # ../../omlish/subprocesses.py
 SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlias
@@ -4252,6 +4253,18 @@ def build_command_name_map(crs: CommandRegistrations) -> CommandNameMap:
     return CommandNameMap(dct)
 
 
+########################################
+# ../deploy/paths/specs.py
+
+
+def check_valid_deploy_spec_path(s: str) -> str:
+    check.non_empty_str(s)
+    for c in ['..', '//']:
+        check.not_in(c, s)
+    check.arg(not s.startswith('/'))
+    return s
+
+
 ########################################
 # ../remote/config.py
 
@@ -6225,6 +6238,17 @@ def register_type_obj_marshaler(ty: type, om: ObjMarshaler) -> None:
     _REGISTERED_OBJ_MARSHALERS_BY_TYPE[ty] = om
 
 
+def register_single_field_type_obj_marshaler(fld, ty=None):
+    def inner(ty):  # noqa
+        register_type_obj_marshaler(ty, SingleFieldObjMarshaler(ty, fld))
+        return ty
+
+    if ty is not None:
+        return inner(ty)
+    else:
+        return inner
+
+
 ##
 
 
@@ -6821,6 +6845,9 @@ def bind_interp_uv() -> InjectorBindings:
 # ../../configs.py
 
 
+##
+
+
 def parse_config_file(
         name: str,
         f: ta.TextIO,
@@ -6864,6 +6891,9 @@ def read_config_file(
     return msh.unmarshal_obj(config_dct, cls)
 
 
+##
+
+
 def build_config_named_children(
         o: ta.Union[
             ta.Sequence[ConfigMapping],
@@ -6902,6 +6932,30 @@ def build_config_named_children(
     return lst
 
 
+##
+
+
+def render_ini_config(
+        settings_by_section: IniConfigSectionSettingsMap,
+) -> str:
+    out = io.StringIO()
+
+    for i, (section, settings) in enumerate(settings_by_section.items()):
+        if i:
+            out.write('\n')
+
+        out.write(f'[{section}]\n')
+
+        for k, v in settings.items():
+            if isinstance(v, str):
+                out.write(f'{k}={v}\n')
+            else:
+                for vv in v:
+                    out.write(f'{k}={vv}\n')
+
+    return out.getvalue()
+
+
 ########################################
 # ../commands/marshal.py
 
@@ -7035,7 +7089,7 @@ def _register_deploy_tag(cls):
     _DEPLOY_TAGS_BY_NAME[cls.tag_name] = cls
     _DEPLOY_TAGS_BY_KWARG[cls.tag_kwarg] = cls
 
-    register_type_obj_marshaler(cls, SingleFieldObjMarshaler(cls, 's'))
+    register_single_field_type_obj_marshaler('s', cls)
 
     return cls
 
@@ -7808,6 +7862,95 @@ class LocalCommandExecutor(CommandExecutor):
         return await ce.execute(cmd)
 
 
+########################################
+# ../deploy/conf/specs.py
+
+
+##
+
+
+class DeployAppConfContent(abc.ABC):  # noqa
+    pass
+
+
+#
+
+
+@register_single_field_type_obj_marshaler('body')
+@dc.dataclass(frozen=True)
+class RawDeployAppConfContent(DeployAppConfContent):
+    body: str
+
+
+#
+
+
+@register_single_field_type_obj_marshaler('obj')
+@dc.dataclass(frozen=True)
+class JsonDeployAppConfContent(DeployAppConfContent):
+    obj: ta.Any
+
+
+#
+
+
+@register_single_field_type_obj_marshaler('sections')
+@dc.dataclass(frozen=True)
+class IniDeployAppConfContent(DeployAppConfContent):
+    sections: IniConfigSectionSettingsMap
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployAppConfFile:
+    path: str
+    content: DeployAppConfContent
+
+    def __post_init__(self) -> None:
+        check_valid_deploy_spec_path(self.path)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployAppConfLink:  # noqa
+    """
+    May be either:
+     - @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
+     - @conf/file - links a single file in a single subdir to conf/@conf/@dst--file
+     - @conf/ - links a directory in root of app conf dir to conf/@conf/@dst/
+    """
+
+    src: str
+
+    kind: ta.Literal['current_only', 'all_active'] = 'current_only'
+
+    def __post_init__(self) -> None:
+        check_valid_deploy_spec_path(self.src)
+        if '/' in self.src:
+            check.equal(self.src.count('/'), 1)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployAppConfSpec:
+    files: ta.Optional[ta.Sequence[DeployAppConfFile]] = None
+
+    links: ta.Optional[ta.Sequence[DeployAppConfLink]] = None
+
+    def __post_init__(self) -> None:
+        if self.files:
+            seen: ta.Set[str] = set()
+            for f in self.files:
+                check.not_in(f.path, seen)
+                seen.add(f.path)
+
+
 ########################################
 # ../deploy/deploy.py
 
@@ -8038,283 +8181,125 @@ class DeployPath:
 
 
 ########################################
-# ../deploy/specs.py
+# ../remote/execution.py
+"""
+TODO:
+ - sequence all messages
+"""
 
 
 ##
 
 
-def check_valid_deploy_spec_path(s: str) -> str:
-    check.non_empty_str(s)
-    for c in ['..', '//']:
-        check.not_in(c, s)
-    check.arg(not s.startswith('/'))
-    return s
+class _RemoteProtocol:
+    class Message(abc.ABC):  # noqa
+        async def send(self, chan: RemoteChannel) -> None:
+            await chan.send_obj(self, _RemoteProtocol.Message)
 
+        @classmethod
+        async def recv(cls: ta.Type[T], chan: RemoteChannel) -> ta.Optional[T]:
+            return await chan.recv_obj(cls)
 
-class DeploySpecKeyed(ta.Generic[KeyDeployTagT]):
-    @cached_nullary
-    def _key_str(self) -> str:
-        return hashlib.sha256(repr(self).encode('utf-8')).hexdigest()[:8]
+    #
 
-    @abc.abstractmethod
-    def key(self) -> KeyDeployTagT:
-        raise NotImplementedError
+    class Request(Message, abc.ABC):  # noqa
+        pass
 
+    @dc.dataclass(frozen=True)
+    class CommandRequest(Request):
+        seq: int
+        cmd: Command
 
-##
+    @dc.dataclass(frozen=True)
+    class PingRequest(Request):
+        time: float
 
+    #
 
-@dc.dataclass(frozen=True)
-class DeployGitRepo:
-    host: ta.Optional[str] = None
-    username: ta.Optional[str] = None
-    path: ta.Optional[str] = None
+    class Response(Message, abc.ABC):  # noqa
+        pass
 
-    def __post_init__(self) -> None:
-        check.not_in('..', check.non_empty_str(self.host))
-        check.not_in('.', check.non_empty_str(self.path))
+    @dc.dataclass(frozen=True)
+    class LogResponse(Response):
+        s: str
 
+    @dc.dataclass(frozen=True)
+    class CommandResponse(Response):
+        seq: int
+        res: CommandOutputOrExceptionData
 
-@dc.dataclass(frozen=True)
-class DeployGitSpec:
-    repo: DeployGitRepo
-    rev: DeployRev
+    @dc.dataclass(frozen=True)
+    class PingResponse(Response):
+        time: float
 
-    subtrees: ta.Optional[ta.Sequence[str]] = None
 
-    def __post_init__(self) -> None:
-        check.non_empty_str(self.rev)
-        if self.subtrees is not None:
-            for st in self.subtrees:
-                check.non_empty_str(st)
+##
 
 
-##
+class _RemoteLogHandler(logging.Handler):
+    def __init__(
+            self,
+            chan: RemoteChannel,
+            loop: ta.Any = None,
+    ) -> None:
+        super().__init__()
 
+        self._chan = chan
+        self._loop = loop
 
-@dc.dataclass(frozen=True)
-class DeployVenvSpec:
-    interp: ta.Optional[str] = None
+    def emit(self, record):
+        msg = self.format(record)
 
-    requirements_files: ta.Optional[ta.Sequence[str]] = None
-    extra_dependencies: ta.Optional[ta.Sequence[str]] = None
+        async def inner():
+            await _RemoteProtocol.LogResponse(msg).send(self._chan)
 
-    use_uv: bool = False
+        loop = self._loop
+        if loop is None:
+            loop = asyncio.get_running_loop()
+        if loop is not None:
+            asyncio.run_coroutine_threadsafe(inner(), loop)
 
 
 ##
 
 
-@dc.dataclass(frozen=True)
-class DeployAppConfFile:
-    path: str
-    body: str
+class _RemoteCommandHandler:
+    DEFAULT_PING_INTERVAL_S: float = 3.
 
-    def __post_init__(self) -> None:
-        check_valid_deploy_spec_path(self.path)
+    def __init__(
+            self,
+            chan: RemoteChannel,
+            executor: CommandExecutor,
+            *,
+            stop: ta.Optional[asyncio.Event] = None,
+            ping_interval_s: float = DEFAULT_PING_INTERVAL_S,
+    ) -> None:
+        super().__init__()
 
+        self._chan = chan
+        self._executor = executor
+        self._stop = stop if stop is not None else asyncio.Event()
+        self._ping_interval_s = ping_interval_s
 
-#
+        self._cmds_by_seq: ta.Dict[int, _RemoteCommandHandler._Command] = {}
 
+        self._last_ping_send: float = 0.
+        self._ping_in_flight: bool = False
+        self._last_ping_recv: ta.Optional[float] = None
 
-@dc.dataclass(frozen=True)
-class DeployAppConfLink:  # noqa
-    """
-    May be either:
-     - @conf(.ext)* - links a single file in root of app conf dir to conf/@conf/@dst(.ext)*
-     - @conf/file - links a single file in a single subdir to conf/@conf/@dst--file
-     - @conf/ - links a directory in root of app conf dir to conf/@conf/@dst/
-    """
+    def stop(self) -> None:
+        self._stop.set()
 
-    src: str
+    @dc.dataclass(frozen=True)
+    class _Command:
+        req: _RemoteProtocol.CommandRequest
+        fut: asyncio.Future
 
-    kind: ta.Literal['current_only', 'all_active'] = 'current_only'
+    async def run(self) -> None:
+        log.debug('_RemoteCommandHandler loop start: %r', self)
 
-    def __post_init__(self) -> None:
-        check_valid_deploy_spec_path(self.src)
-        if '/' in self.src:
-            check.equal(self.src.count('/'), 1)
-
-
-#
-
-
-@dc.dataclass(frozen=True)
-class DeployAppConfSpec:
-    files: ta.Optional[ta.Sequence[DeployAppConfFile]] = None
-
-    links: ta.Optional[ta.Sequence[DeployAppConfLink]] = None
-
-    def __post_init__(self) -> None:
-        if self.files:
-            seen: ta.Set[str] = set()
-            for f in self.files:
-                check.not_in(f.path, seen)
-                seen.add(f.path)
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class DeployAppSpec(DeploySpecKeyed[DeployAppKey]):
-    app: DeployApp
-
-    git: DeployGitSpec
-
-    venv: ta.Optional[DeployVenvSpec] = None
-
-    conf: ta.Optional[DeployAppConfSpec] = None
-
-    # @ta.override
-    def key(self) -> DeployAppKey:
-        return DeployAppKey(self._key_str())
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class DeploySpec(DeploySpecKeyed[DeployKey]):
-    home: DeployHome
-
-    apps: ta.Sequence[DeployAppSpec]
-
-    def __post_init__(self) -> None:
-        check.non_empty_str(self.home)
-
-        seen: ta.Set[DeployApp] = set()
-        for a in self.apps:
-            if a.app in seen:
-                raise KeyError(a.app)
-            seen.add(a.app)
-
-    # @ta.override
-    def key(self) -> DeployKey:
-        return DeployKey(self._key_str())
-
-
-########################################
-# ../remote/execution.py
-"""
-TODO:
- - sequence all messages
-"""
-
-
-##
-
-
-class _RemoteProtocol:
-    class Message(abc.ABC):  # noqa
-        async def send(self, chan: RemoteChannel) -> None:
-            await chan.send_obj(self, _RemoteProtocol.Message)
-
-        @classmethod
-        async def recv(cls: ta.Type[T], chan: RemoteChannel) -> ta.Optional[T]:
-            return await chan.recv_obj(cls)
-
-    #
-
-    class Request(Message, abc.ABC):  # noqa
-        pass
-
-    @dc.dataclass(frozen=True)
-    class CommandRequest(Request):
-        seq: int
-        cmd: Command
-
-    @dc.dataclass(frozen=True)
-    class PingRequest(Request):
-        time: float
-
-    #
-
-    class Response(Message, abc.ABC):  # noqa
-        pass
-
-    @dc.dataclass(frozen=True)
-    class LogResponse(Response):
-        s: str
-
-    @dc.dataclass(frozen=True)
-    class CommandResponse(Response):
-        seq: int
-        res: CommandOutputOrExceptionData
-
-    @dc.dataclass(frozen=True)
-    class PingResponse(Response):
-        time: float
-
-
-##
-
-
-class _RemoteLogHandler(logging.Handler):
-    def __init__(
-            self,
-            chan: RemoteChannel,
-            loop: ta.Any = None,
-    ) -> None:
-        super().__init__()
-
-        self._chan = chan
-        self._loop = loop
-
-    def emit(self, record):
-        msg = self.format(record)
-
-        async def inner():
-            await _RemoteProtocol.LogResponse(msg).send(self._chan)
-
-        loop = self._loop
-        if loop is None:
-            loop = asyncio.get_running_loop()
-        if loop is not None:
-            asyncio.run_coroutine_threadsafe(inner(), loop)
-
-
-##
-
-
-class _RemoteCommandHandler:
-    DEFAULT_PING_INTERVAL_S: float = 3.
-
-    def __init__(
-            self,
-            chan: RemoteChannel,
-            executor: CommandExecutor,
-            *,
-            stop: ta.Optional[asyncio.Event] = None,
-            ping_interval_s: float = DEFAULT_PING_INTERVAL_S,
-    ) -> None:
-        super().__init__()
-
-        self._chan = chan
-        self._executor = executor
-        self._stop = stop if stop is not None else asyncio.Event()
-        self._ping_interval_s = ping_interval_s
-
-        self._cmds_by_seq: ta.Dict[int, _RemoteCommandHandler._Command] = {}
-
-        self._last_ping_send: float = 0.
-        self._ping_in_flight: bool = False
-        self._last_ping_recv: ta.Optional[float] = None
-
-    def stop(self) -> None:
-        self._stop.set()
-
-    @dc.dataclass(frozen=True)
-    class _Command:
-        req: _RemoteProtocol.CommandRequest
-        fut: asyncio.Future
-
-    async def run(self) -> None:
-        log.debug('_RemoteCommandHandler loop start: %r', self)
-
-        stop_task = asyncio.create_task(self._stop.wait())
-        recv_task: ta.Optional[asyncio.Task] = None
+        stop_task = asyncio.create_task(self._stop.wait())
+        recv_task: ta.Optional[asyncio.Task] = None
 
         while not self._stop.is_set():
             if recv_task is None:
@@ -8914,6 +8899,88 @@ class InterpInspector:
             return ret
 
 
+########################################
+# ../../../omdev/interp/pyenv/pyenv.py
+"""
+TODO:
+ - custom tags
+  - 'aliases'
+  - https://github.com/pyenv/pyenv/pull/2966
+  - https://github.com/pyenv/pyenv/issues/218 (lol)
+  - probably need custom (temp?) definition file
+  - *or* python-build directly just into the versions dir?
+ - optionally install / upgrade pyenv itself
+ - new vers dont need these custom mac opts, only run on old vers
+"""
+
+
+class Pyenv:
+    def __init__(
+            self,
+            *,
+            root: ta.Optional[str] = None,
+    ) -> None:
+        if root is not None and not (isinstance(root, str) and root):
+            raise ValueError(f'pyenv_root: {root!r}')
+
+        super().__init__()
+
+        self._root_kw = root
+
+    @async_cached_nullary
+    async def root(self) -> ta.Optional[str]:
+        if self._root_kw is not None:
+            return self._root_kw
+
+        if shutil.which('pyenv'):
+            return await asyncio_subprocesses.check_output_str('pyenv', 'root')
+
+        d = os.path.expanduser('~/.pyenv')
+        if os.path.isdir(d) and os.path.isfile(os.path.join(d, 'bin', 'pyenv')):
+            return d
+
+        return None
+
+    @async_cached_nullary
+    async def exe(self) -> str:
+        return os.path.join(check.not_none(await self.root()), 'bin', 'pyenv')
+
+    async def version_exes(self) -> ta.List[ta.Tuple[str, str]]:
+        if (root := await self.root()) is None:
+            return []
+        ret = []
+        vp = os.path.join(root, 'versions')
+        if os.path.isdir(vp):
+            for dn in os.listdir(vp):
+                ep = os.path.join(vp, dn, 'bin', 'python')
+                if not os.path.isfile(ep):
+                    continue
+                ret.append((dn, ep))
+        return ret
+
+    async def installable_versions(self) -> ta.List[str]:
+        if await self.root() is None:
+            return []
+        ret = []
+        s = await asyncio_subprocesses.check_output_str(await self.exe(), 'install', '--list')
+        for l in s.splitlines():
+            if not l.startswith('  '):
+                continue
+            l = l.strip()
+            if not l:
+                continue
+            ret.append(l)
+        return ret
+
+    async def update(self) -> bool:
+        if (root := await self.root()) is None:
+            return False
+        if not os.path.isdir(os.path.join(root, '.git')):
+            return False
+        await asyncio_subprocesses.check_call('git', 'pull', cwd=root)
+        return True
+
+
 ########################################
 # ../../../omdev/interp/resolvers.py
 
@@ -9073,7 +9140,7 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
 
 
 ########################################
-# ../deploy/conf.py
+# ../deploy/conf/manager.py
 """
 TODO:
  - @conf DeployPathPlaceholder? :|
@@ -9094,6 +9161,19 @@ TODO:
 
 
 class DeployConfManager:
+    def _render_app_conf_content(self, ac: DeployAppConfContent) -> str:
+        if isinstance(ac, RawDeployAppConfContent):
+            return ac.body
+
+        elif isinstance(ac, JsonDeployAppConfContent):
+            return strip_with_newline(json_dumps_pretty(ac.obj))
+
+        elif isinstance(ac, IniDeployAppConfContent):
+            return strip_with_newline(render_ini_config(ac.sections))
+
+        else:
+            raise TypeError(ac)
+
     async def _write_app_conf_file(
             self,
             acf: DeployAppConfFile,
@@ -9102,10 +9182,12 @@ class DeployConfManager:
         conf_file = os.path.join(app_conf_dir, acf.path)
         check.arg(is_path_in_dir(app_conf_dir, conf_file))
 
+        body = self._render_app_conf_content(acf.content)
+
         os.makedirs(os.path.dirname(conf_file), exist_ok=True)
 
         with open(conf_file, 'w') as f:  # noqa
-            f.write(acf.body)
+            f.write(body)
 
     #
 
@@ -9252,33 +9334,132 @@ class DeployPathOwner(abc.ABC):
         raise NotImplementedError
 
 
-DeployPathOwners = ta.NewType('DeployPathOwners', ta.Sequence[DeployPathOwner])
+DeployPathOwners = ta.NewType('DeployPathOwners', ta.Sequence[DeployPathOwner])
+
+
+class SingleDirDeployPathOwner(DeployPathOwner, abc.ABC):
+    def __init__(
+            self,
+            *args: ta.Any,
+            owned_dir: str,
+            **kwargs: ta.Any,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+
+        check.not_in('/', owned_dir)
+        self._owned_dir: str = check.non_empty_str(owned_dir)
+
+        self._owned_deploy_paths = frozenset([DeployPath.parse(self._owned_dir + '/')])
+
+    def _dir(self, home: DeployHome) -> str:
+        return os.path.join(check.non_empty_str(home), self._owned_dir)
+
+    def _make_dir(self, home: DeployHome) -> str:
+        if not os.path.isdir(d := self._dir(home)):
+            os.makedirs(d, exist_ok=True)
+        return d
+
+    def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
+        return self._owned_deploy_paths
+
+
+########################################
+# ../deploy/specs.py
+
+
+##
+
+
+class DeploySpecKeyed(ta.Generic[KeyDeployTagT]):
+    @cached_nullary
+    def _key_str(self) -> str:
+        return hashlib.sha256(repr(self).encode('utf-8')).hexdigest()[:8]
+
+    @abc.abstractmethod
+    def key(self) -> KeyDeployTagT:
+        raise NotImplementedError
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployGitRepo:
+    host: ta.Optional[str] = None
+    username: ta.Optional[str] = None
+    path: ta.Optional[str] = None
+
+    def __post_init__(self) -> None:
+        check.not_in('..', check.non_empty_str(self.host))
+        check.not_in('.', check.non_empty_str(self.path))
+
+
+@dc.dataclass(frozen=True)
+class DeployGitSpec:
+    repo: DeployGitRepo
+    rev: DeployRev
+
+    subtrees: ta.Optional[ta.Sequence[str]] = None
+
+    def __post_init__(self) -> None:
+        check.non_empty_str(self.rev)
+        if self.subtrees is not None:
+            for st in self.subtrees:
+                check.non_empty_str(st)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployVenvSpec:
+    interp: ta.Optional[str] = None
+
+    requirements_files: ta.Optional[ta.Sequence[str]] = None
+    extra_dependencies: ta.Optional[ta.Sequence[str]] = None
+
+    use_uv: bool = False
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployAppSpec(DeploySpecKeyed[DeployAppKey]):
+    app: DeployApp
+
+    git: DeployGitSpec
+
+    venv: ta.Optional[DeployVenvSpec] = None
+
+    conf: ta.Optional[DeployAppConfSpec] = None
+
+    # @ta.override
+    def key(self) -> DeployAppKey:
+        return DeployAppKey(self._key_str())
+
 
+##
 
-class SingleDirDeployPathOwner(DeployPathOwner, abc.ABC):
-    def __init__(
-            self,
-            *args: ta.Any,
-            owned_dir: str,
-            **kwargs: ta.Any,
-    ) -> None:
-        super().__init__(*args, **kwargs)
 
-        check.not_in('/', owned_dir)
-        self._owned_dir: str = check.non_empty_str(owned_dir)
+@dc.dataclass(frozen=True)
+class DeploySpec(DeploySpecKeyed[DeployKey]):
+    home: DeployHome
 
-        self._owned_deploy_paths = frozenset([DeployPath.parse(self._owned_dir + '/')])
+    apps: ta.Sequence[DeployAppSpec]
 
-    def _dir(self, home: DeployHome) -> str:
-        return os.path.join(check.non_empty_str(home), self._owned_dir)
+    def __post_init__(self) -> None:
+        check.non_empty_str(self.home)
 
-    def _make_dir(self, home: DeployHome) -> str:
-        if not os.path.isdir(d := self._dir(home)):
-            os.makedirs(d, exist_ok=True)
-        return d
+        seen: ta.Set[DeployApp] = set()
+        for a in self.apps:
+            if a.app in seen:
+                raise KeyError(a.app)
+            seen.add(a.app)
 
-    def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
-        return self._owned_deploy_paths
+    # @ta.override
+    def key(self) -> DeployKey:
+        return DeployKey(self._key_str())
 
 
 ########################################
@@ -9802,88 +9983,7 @@ class SystemInterpProvider(InterpProvider):
 
 
 ########################################
-# ../../../omdev/interp/pyenv/pyenv.py
-"""
-TODO:
- - custom tags
-  - 'aliases'
-  - https://github.com/pyenv/pyenv/pull/2966
-  - https://github.com/pyenv/pyenv/issues/218 (lol)
-  - probably need custom (temp?) definition file
-  - *or* python-build directly just into the versions dir?
- - optionally install / upgrade pyenv itself
- - new vers dont need these custom mac opts, only run on old vers
-"""
-
-
-##
-
-
-class Pyenv:
-    def __init__(
-            self,
-            *,
-            root: ta.Optional[str] = None,
-    ) -> None:
-        if root is not None and not (isinstance(root, str) and root):
-            raise ValueError(f'pyenv_root: {root!r}')
-
-        super().__init__()
-
-        self._root_kw = root
-
-    @async_cached_nullary
-    async def root(self) -> ta.Optional[str]:
-        if self._root_kw is not None:
-            return self._root_kw
-
-        if shutil.which('pyenv'):
-            return await asyncio_subprocesses.check_output_str('pyenv', 'root')
-
-        d = os.path.expanduser('~/.pyenv')
-        if os.path.isdir(d) and os.path.isfile(os.path.join(d, 'bin', 'pyenv')):
-            return d
-
-        return None
-
-    @async_cached_nullary
-    async def exe(self) -> str:
-        return os.path.join(check.not_none(await self.root()), 'bin', 'pyenv')
-
-    async def version_exes(self) -> ta.List[ta.Tuple[str, str]]:
-        if (root := await self.root()) is None:
-            return []
-        ret = []
-        vp = os.path.join(root, 'versions')
-        if os.path.isdir(vp):
-            for dn in os.listdir(vp):
-                ep = os.path.join(vp, dn, 'bin', 'python')
-                if not os.path.isfile(ep):
-                    continue
-                ret.append((dn, ep))
-        return ret
-
-    async def installable_versions(self) -> ta.List[str]:
-        if await self.root() is None:
-            return []
-        ret = []
-        s = await asyncio_subprocesses.check_output_str(await self.exe(), 'install', '--list')
-        for l in s.splitlines():
-            if not l.startswith('  '):
-                continue
-            l = l.strip()
-            if not l:
-                continue
-            ret.append(l)
-        return ret
-
-    async def update(self) -> bool:
-        if (root := await self.root()) is None:
-            return False
-        if not os.path.isdir(os.path.join(root, '.git')):
-            return False
-        await asyncio_subprocesses.check_call('git', 'pull', cwd=root)
-        return True
+# ../../../omdev/interp/pyenv/install.py
 
 
 ##
@@ -10094,161 +10194,31 @@ class PyenvVersionInstaller:
         conf_args = [
             *opts.opts,
             self._version,
-        ]
-
-        full_args: ta.List[str]
-        if self._given_install_name is not None:
-            full_args = [
-                os.path.join(check.not_none(await self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),  # noqa
-                *conf_args,
-                await self.install_dir(),
-            ]
-        else:
-            full_args = [
-                await self._pyenv.exe(),
-                'install',
-                *conf_args,
-            ]
-
-        await asyncio_subprocesses.check_call(
-            *full_args,
-            env=env,
-        )
-
-        exe = os.path.join(await self.install_dir(), 'bin', 'python')
-        if not os.path.isfile(exe):
-            raise RuntimeError(f'Interpreter not found: {exe}')
-        return exe
-
-
-##
-
-
-class PyenvInterpProvider(InterpProvider):
-    @dc.dataclass(frozen=True)
-    class Options:
-        inspect: bool = False
-
-        try_update: bool = False
-
-    def __init__(
-            self,
-            options: Options = Options(),
-            *,
-            pyenv: Pyenv,
-            inspector: InterpInspector,
-            log: ta.Optional[logging.Logger] = None,
-    ) -> None:
-        super().__init__()
-
-        self._options = options
-
-        self._pyenv = pyenv
-        self._inspector = inspector
-        self._log = log
-
-    #
-
-    @staticmethod
-    def guess_version(s: str) -> ta.Optional[InterpVersion]:
-        def strip_sfx(s: str, sfx: str) -> ta.Tuple[str, bool]:
-            if s.endswith(sfx):
-                return s[:-len(sfx)], True
-            return s, False
-        ok = {}
-        s, ok['debug'] = strip_sfx(s, '-debug')
-        s, ok['threaded'] = strip_sfx(s, 't')
-        try:
-            v = Version(s)
-        except InvalidVersion:
-            return None
-        return InterpVersion(v, InterpOpts(**ok))
-
-    class Installed(ta.NamedTuple):
-        name: str
-        exe: str
-        version: InterpVersion
-
-    async def _make_installed(self, vn: str, ep: str) -> ta.Optional[Installed]:
-        iv: ta.Optional[InterpVersion]
-        if self._options.inspect:
-            try:
-                iv = check.not_none(await self._inspector.inspect(ep)).iv
-            except Exception as e:  # noqa
-                return None
-        else:
-            iv = self.guess_version(vn)
-        if iv is None:
-            return None
-        return PyenvInterpProvider.Installed(
-            name=vn,
-            exe=ep,
-            version=iv,
-        )
-
-    async def installed(self) -> ta.Sequence[Installed]:
-        ret: ta.List[PyenvInterpProvider.Installed] = []
-        for vn, ep in await self._pyenv.version_exes():
-            if (i := await self._make_installed(vn, ep)) is None:
-                if self._log is not None:
-                    self._log.debug('Invalid pyenv version: %s', vn)
-                continue
-            ret.append(i)
-        return ret
-
-    #
-
-    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
-        return [i.version for i in await self.installed()]
-
-    async def get_installed_version(self, version: InterpVersion) -> Interp:
-        for i in await self.installed():
-            if i.version == version:
-                return Interp(
-                    exe=i.exe,
-                    version=i.version,
-                )
-        raise KeyError(version)
-
-    #
-
-    async def _get_installable_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
-        lst = []
-
-        for vs in await self._pyenv.installable_versions():
-            if (iv := self.guess_version(vs)) is None:
-                continue
-            if iv.opts.debug:
-                raise Exception('Pyenv installable versions not expected to have debug suffix')
-            for d in [False, True]:
-                lst.append(dc.replace(iv, opts=dc.replace(iv.opts, debug=d)))
-
-        return lst
-
-    async def get_installable_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
-        lst = await self._get_installable_versions(spec)
-
-        if self._options.try_update and not any(v in spec for v in lst):
-            if self._pyenv.update():
-                lst = await self._get_installable_versions(spec)
-
-        return lst
+        ]
 
-    async def install_version(self, version: InterpVersion) -> Interp:
-        inst_version = str(version.version)
-        inst_opts = version.opts
-        if inst_opts.threaded:
-            inst_version += 't'
-            inst_opts = dc.replace(inst_opts, threaded=False)
+        full_args: ta.List[str]
+        if self._given_install_name is not None:
+            full_args = [
+                os.path.join(check.not_none(await self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),  # noqa
+                *conf_args,
+                await self.install_dir(),
+            ]
+        else:
+            full_args = [
+                await self._pyenv.exe(),
+                'install',
+                *conf_args,
+            ]
 
-        installer = PyenvVersionInstaller(
-            inst_version,
-            interp_opts=inst_opts,
-            pyenv=self._pyenv,
+        await asyncio_subprocesses.check_call(
+            *full_args,
+            env=env,
         )
 
-        exe = await installer.install()
-        return Interp(exe, version)
+        exe = os.path.join(await self.install_dir(), 'bin', 'python')
+        if not os.path.isfile(exe):
+            raise RuntimeError(f'Interpreter not found: {exe}')
+        return exe
 
 
 ########################################
@@ -10351,6 +10321,18 @@ def bind_commands(
     return inj.as_bindings(*lst)
 
 
+########################################
+# ../deploy/inject_.py
+
+
+def bind_deploy_manager(cls: type) -> InjectorBindings:
+    return inj.as_bindings(
+        inj.bind(cls, singleton=True),
+
+        *([inj.bind(DeployPathOwner, to_key=cls, array=True)] if issubclass(cls, DeployPathOwner) else []),
+    )
+
+
 ########################################
 # ../deploy/paths/manager.py
 
@@ -10578,15 +10560,143 @@ def bind_interp_providers() -> InjectorBindings:
 
 
 ########################################
-# ../../../omdev/interp/pyenv/inject.py
+# ../../../omdev/interp/pyenv/provider.py
 
 
-def bind_interp_pyenv() -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = [
-        inj.bind(Pyenv, singleton=True),
+class PyenvInterpProvider(InterpProvider):
+    @dc.dataclass(frozen=True)
+    class Options:
+        inspect: bool = False
 
-        inj.bind(PyenvInterpProvider, singleton=True),
-        inj.bind(InterpProvider, to_key=PyenvInterpProvider, array=True),
+        try_update: bool = False
+
+    def __init__(
+            self,
+            options: Options = Options(),
+            *,
+            pyenv: Pyenv,
+            inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
+        super().__init__()
+
+        self._options = options
+
+        self._pyenv = pyenv
+        self._inspector = inspector
+        self._log = log
+
+    #
+
+    @staticmethod
+    def guess_version(s: str) -> ta.Optional[InterpVersion]:
+        def strip_sfx(s: str, sfx: str) -> ta.Tuple[str, bool]:
+            if s.endswith(sfx):
+                return s[:-len(sfx)], True
+            return s, False
+        ok = {}
+        s, ok['debug'] = strip_sfx(s, '-debug')
+        s, ok['threaded'] = strip_sfx(s, 't')
+        try:
+            v = Version(s)
+        except InvalidVersion:
+            return None
+        return InterpVersion(v, InterpOpts(**ok))
+
+    class Installed(ta.NamedTuple):
+        name: str
+        exe: str
+        version: InterpVersion
+
+    async def _make_installed(self, vn: str, ep: str) -> ta.Optional[Installed]:
+        iv: ta.Optional[InterpVersion]
+        if self._options.inspect:
+            try:
+                iv = check.not_none(await self._inspector.inspect(ep)).iv
+            except Exception as e:  # noqa
+                return None
+        else:
+            iv = self.guess_version(vn)
+        if iv is None:
+            return None
+        return PyenvInterpProvider.Installed(
+            name=vn,
+            exe=ep,
+            version=iv,
+        )
+
+    async def installed(self) -> ta.Sequence[Installed]:
+        ret: ta.List[PyenvInterpProvider.Installed] = []
+        for vn, ep in await self._pyenv.version_exes():
+            if (i := await self._make_installed(vn, ep)) is None:
+                if self._log is not None:
+                    self._log.debug('Invalid pyenv version: %s', vn)
+                continue
+            ret.append(i)
+        return ret
+
+    #
+
+    async def get_installed_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        return [i.version for i in await self.installed()]
+
+    async def get_installed_version(self, version: InterpVersion) -> Interp:
+        for i in await self.installed():
+            if i.version == version:
+                return Interp(
+                    exe=i.exe,
+                    version=i.version,
+                )
+        raise KeyError(version)
+
+    #
+
+    async def _get_installable_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        lst = []
+
+        for vs in await self._pyenv.installable_versions():
+            if (iv := self.guess_version(vs)) is None:
+                continue
+            if iv.opts.debug:
+                raise Exception('Pyenv installable versions not expected to have debug suffix')
+            for d in [False, True]:
+                lst.append(dc.replace(iv, opts=dc.replace(iv.opts, debug=d)))
+
+        return lst
+
+    async def get_installable_versions(self, spec: InterpSpecifier) -> ta.Sequence[InterpVersion]:
+        lst = await self._get_installable_versions(spec)
+
+        if self._options.try_update and not any(v in spec for v in lst):
+            if self._pyenv.update():
+                lst = await self._get_installable_versions(spec)
+
+        return lst
+
+    async def install_version(self, version: InterpVersion) -> Interp:
+        inst_version = str(version.version)
+        inst_opts = version.opts
+        if inst_opts.threaded:
+            inst_version += 't'
+            inst_opts = dc.replace(inst_opts, threaded=False)
+
+        installer = PyenvVersionInstaller(
+            inst_version,
+            interp_opts=inst_opts,
+            pyenv=self._pyenv,
+        )
+
+        exe = await installer.install()
+        return Interp(exe, version)
+
+
+########################################
+# ../deploy/conf/inject.py
+
+
+def bind_deploy_conf() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        bind_deploy_manager(DeployConfManager),
     ]
 
     return inj.as_bindings(*lst)
@@ -10955,6 +11065,50 @@ class SshManageTargetConnector(ManageTargetConnector):
             yield rce
 
 
+########################################
+# ../../../omdev/interp/pyenv/inject.py
+
+
+def bind_interp_pyenv() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(Pyenv, singleton=True),
+
+        inj.bind(PyenvInterpProvider, singleton=True),
+        inj.bind(InterpProvider, to_key=PyenvInterpProvider, array=True),
+    ]
+
+    return inj.as_bindings(*lst)
+
+
+########################################
+# ../targets/inject.py
+
+
+def bind_targets() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(LocalManageTargetConnector, singleton=True),
+        inj.bind(DockerManageTargetConnector, singleton=True),
+        inj.bind(SshManageTargetConnector, singleton=True),
+
+        inj.bind(TypeSwitchedManageTargetConnector, singleton=True),
+        inj.bind(ManageTargetConnector, to_key=TypeSwitchedManageTargetConnector),
+    ]
+
+    #
+
+    def provide_manage_target_connector_map(injector: Injector) -> ManageTargetConnectorMap:
+        return ManageTargetConnectorMap({
+            LocalManageTarget: injector[LocalManageTargetConnector],
+            DockerManageTarget: injector[DockerManageTargetConnector],
+            SshManageTarget: injector[SshManageTargetConnector],
+        })
+    lst.append(inj.bind(provide_manage_target_connector_map, singleton=True))
+
+    #
+
+    return inj.as_bindings(*lst)
+
+
 ########################################
 # ../../../omdev/interp/inject.py
 
@@ -10996,35 +11150,6 @@ def bind_interp() -> InjectorBindings:
     return inj.as_bindings(*lst)
 
 
-########################################
-# ../targets/inject.py
-
-
-def bind_targets() -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = [
-        inj.bind(LocalManageTargetConnector, singleton=True),
-        inj.bind(DockerManageTargetConnector, singleton=True),
-        inj.bind(SshManageTargetConnector, singleton=True),
-
-        inj.bind(TypeSwitchedManageTargetConnector, singleton=True),
-        inj.bind(ManageTargetConnector, to_key=TypeSwitchedManageTargetConnector),
-    ]
-
-    #
-
-    def provide_manage_target_connector_map(injector: Injector) -> ManageTargetConnectorMap:
-        return ManageTargetConnectorMap({
-            LocalManageTarget: injector[LocalManageTargetConnector],
-            DockerManageTarget: injector[DockerManageTargetConnector],
-            SshManageTarget: injector[SshManageTargetConnector],
-        })
-    lst.append(inj.bind(provide_manage_target_connector_map, singleton=True))
-
-    #
-
-    return inj.as_bindings(*lst)
-
-
 ########################################
 # ../../../omdev/interp/default.py
 
@@ -11422,6 +11547,8 @@ def bind_deploy(
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(deploy_config),
 
+        bind_deploy_conf(),
+
         bind_deploy_paths(),
 
         bind_deploy_scope(),
@@ -11429,27 +11556,16 @@ def bind_deploy(
 
     #
 
-    def bind_manager(cls: type) -> InjectorBindings:
-        return inj.as_bindings(
-            inj.bind(cls, singleton=True),
-
-            *([inj.bind(DeployPathOwner, to_key=cls, array=True)] if issubclass(cls, DeployPathOwner) else []),
-        )
-
-    #
-
     lst.extend([
-        bind_manager(DeployAppManager),
-
-        bind_manager(DeployConfManager),
+        bind_deploy_manager(DeployAppManager),
 
-        bind_manager(DeployGitManager),
+        bind_deploy_manager(DeployGitManager),
 
-        bind_manager(DeployManager),
+        bind_deploy_manager(DeployManager),
 
-        bind_manager(DeployTmpManager),
+        bind_deploy_manager(DeployTmpManager),
 
-        bind_manager(DeployVenvManager),
+        bind_deploy_manager(DeployVenvManager),
     ])
 
     #