ominfra 0.0.0.dev160__py3-none-any.whl → 0.0.0.dev162__py3-none-any.whl

ominfra/manage/deploy/git.py

@@ -15,8 +15,8 @@ import typing as ta
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
+from omlish.os.atomics import AtomicPathSwapping
 
-from .atomics import DeployAtomicPathSwapping
 from .paths import SingleDirDeployPathOwner
 from .specs import DeployGitCheckout
 from .specs import DeployGitRepo
@@ -32,7 +32,7 @@ class DeployGitManager(SingleDirDeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__(
             owned_dir='git',

ominfra/manage/deploy/inject.py

@@ -5,10 +5,10 @@ import typing as ta
 from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
+from omlish.os.atomics import AtomicPathSwapping
 
 from ..commands.inject import bind_command
 from .apps import DeployAppManager
-from .atomics import DeployAtomicPathSwapping
 from .commands import DeployCommand
 from .commands import DeployCommandExecutor
 from .config import DeployConfig
@@ -34,7 +34,7 @@ def bind_deploy(
         inj.bind(DeployGitManager, singleton=True),
 
         inj.bind(DeployTmpManager, singleton=True),
-        inj.bind(DeployAtomicPathSwapping, to_key=DeployTmpManager),
+        inj.bind(AtomicPathSwapping, to_key=DeployTmpManager),
 
         inj.bind(DeployVenvManager, singleton=True),
 

ominfra/manage/deploy/tmp.py

@@ -3,18 +3,18 @@ import typing as ta
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
+from omlish.os.atomics import AtomicPathSwap
+from omlish.os.atomics import AtomicPathSwapKind
+from omlish.os.atomics import AtomicPathSwapping
+from omlish.os.atomics import TempDirAtomicPathSwapping
 
-from .atomics import DeployAtomicPathSwap
-from .atomics import DeployAtomicPathSwapKind
-from .atomics import DeployAtomicPathSwapping
-from .atomics import TempDirDeployAtomicPathSwapping
 from .paths import SingleDirDeployPathOwner
 from .types import DeployHome
 
 
 class DeployTmpManager(
     SingleDirDeployPathOwner,
-    DeployAtomicPathSwapping,
+    AtomicPathSwapping,
 ):
     def __init__(
             self,
@@ -27,18 +27,18 @@ class DeployTmpManager(
         )
 
     @cached_nullary
-    def _swapping(self) -> DeployAtomicPathSwapping:
-        return TempDirDeployAtomicPathSwapping(
+    def _swapping(self) -> AtomicPathSwapping:
+        return TempDirAtomicPathSwapping(
             temp_dir=self._make_dir(),
             root_dir=check.non_empty_str(self._deploy_home),
         )
 
     def begin_atomic_path_swap(
             self,
-            kind: DeployAtomicPathSwapKind,
+            kind: AtomicPathSwapKind,
             dst_path: str,
             **kwargs: ta.Any,
-    ) -> DeployAtomicPathSwap:
+    ) -> AtomicPathSwap:
         return self._swapping().begin_atomic_path_swap(
             kind,
             dst_path,

ominfra/manage/deploy/venvs.py

@@ -10,8 +10,8 @@ import typing as ta
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
+from omlish.os.atomics import AtomicPathSwapping
 
-from .atomics import DeployAtomicPathSwapping
 from .paths import DeployPath
 from .paths import DeployPathOwner
 from .types import DeployAppTag
@@ -23,7 +23,7 @@ class DeployVenvManager(DeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__()
 

ominfra/manage/targets/connection.py

@@ -105,7 +105,7 @@ class DockerManageTargetConnector(ManageTargetConnector):
         if dmt.image is not None:
             sh_parts.extend(['run', '-i', dmt.image])
         elif dmt.container_id is not None:
-            sh_parts.extend(['exec', dmt.container_id])
+            sh_parts.extend(['exec', '-i', dmt.container_id])
         else:
             raise ValueError(dmt)
 

ominfra/scripts/manage.py

@@ -100,10 +100,6 @@ CallableVersionOperator = ta.Callable[['Version', str], bool]
 CommandT = ta.TypeVar('CommandT', bound='Command')
 CommandOutputT = ta.TypeVar('CommandOutputT', bound='Command.Output')
 
-# deploy/atomics.py
-DeployAtomicPathSwapKind = ta.Literal['dir', 'file']
-DeployAtomicPathSwapState = ta.Literal['open', 'committed', 'aborted']  # ta.TypeAlias
-
 # deploy/paths.py
 DeployPathKind = ta.Literal['dir', 'file']  # ta.TypeAlias
 DeployPathPlaceholder = ta.Literal['app', 'tag']  # ta.TypeAlias
@@ -121,6 +117,10 @@ InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
 InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
 InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
 
+# ../../omlish/os/atomics.py
+AtomicPathSwapKind = ta.Literal['dir', 'file']
+AtomicPathSwapState = ta.Literal['open', 'committed', 'aborted']  # ta.TypeAlias
+
 # ../configs.py
 ConfigMapping = ta.Mapping[str, ta.Any]
 
@@ -4064,204 +4064,6 @@ def build_command_name_map(crs: CommandRegistrations) -> CommandNameMap:
     return CommandNameMap(dct)
 
 
-########################################
-# ../deploy/atomics.py
-
-
-##
-
-
-class DeployAtomicPathSwap(abc.ABC):
-    def __init__(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            *,
-            auto_commit: bool = False,
-    ) -> None:
-        super().__init__()
-
-        self._kind = kind
-        self._dst_path = dst_path
-        self._auto_commit = auto_commit
-
-        self._state: DeployAtomicPathSwapState = 'open'
-
-    def __repr__(self) -> str:
-        return attr_repr(self, 'kind', 'dst_path', 'tmp_path')
-
-    @property
-    def kind(self) -> DeployAtomicPathSwapKind:
-        return self._kind
-
-    @property
-    def dst_path(self) -> str:
-        return self._dst_path
-
-    @property
-    @abc.abstractmethod
-    def tmp_path(self) -> str:
-        raise NotImplementedError
-
-    #
-
-    @property
-    def state(self) -> DeployAtomicPathSwapState:
-        return self._state
-
-    def _check_state(self, *states: DeployAtomicPathSwapState) -> None:
-        if self._state not in states:
-            raise RuntimeError(f'Atomic path swap not in correct state: {self._state}, {states}')
-
-    #
-
-    @abc.abstractmethod
-    def _commit(self) -> None:
-        raise NotImplementedError
-
-    def commit(self) -> None:
-        if self._state == 'committed':
-            return
-        self._check_state('open')
-        try:
-            self._commit()
-        except Exception:  # noqa
-            self._abort()
-            raise
-        else:
-            self._state = 'committed'
-
-    #
-
-    @abc.abstractmethod
-    def _abort(self) -> None:
-        raise NotImplementedError
-
-    def abort(self) -> None:
-        if self._state == 'aborted':
-            return
-        self._abort()
-        self._state = 'aborted'
-
-    #
-
-    def __enter__(self) -> 'DeployAtomicPathSwap':
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if (
-                exc_type is None and
-                self._auto_commit and
-                self._state == 'open'
-        ):
-            self.commit()
-        else:
-            self.abort()
-
-
-#
-
-
-class DeployAtomicPathSwapping(abc.ABC):
-    @abc.abstractmethod
-    def begin_atomic_path_swap(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            *,
-            name_hint: ta.Optional[str] = None,
-            make_dirs: bool = False,
-            **kwargs: ta.Any,
-    ) -> DeployAtomicPathSwap:
-        raise NotImplementedError
-
-
-##
-
-
-class OsRenameDeployAtomicPathSwap(DeployAtomicPathSwap):
-    def __init__(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            tmp_path: str,
-            **kwargs: ta.Any,
-    ) -> None:
-        if kind == 'dir':
-            check.state(os.path.isdir(tmp_path))
-        elif kind == 'file':
-            check.state(os.path.isfile(tmp_path))
-        else:
-            raise TypeError(kind)
-
-        super().__init__(
-            kind,
-            dst_path,
-            **kwargs,
-        )
-
-        self._tmp_path = tmp_path
-
-    @property
-    def tmp_path(self) -> str:
-        return self._tmp_path
-
-    def _commit(self) -> None:
-        os.rename(self._tmp_path, self._dst_path)
-
-    def _abort(self) -> None:
-        shutil.rmtree(self._tmp_path, ignore_errors=True)
-
-
-class TempDirDeployAtomicPathSwapping(DeployAtomicPathSwapping):
-    def __init__(
-            self,
-            *,
-            temp_dir: ta.Optional[str] = None,
-            root_dir: ta.Optional[str] = None,
-    ) -> None:
-        super().__init__()
-
-        if root_dir is not None:
-            root_dir = os.path.abspath(root_dir)
-        self._root_dir = root_dir
-        self._temp_dir = temp_dir
-
-    def begin_atomic_path_swap(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            *,
-            name_hint: ta.Optional[str] = None,
-            make_dirs: bool = False,
-            **kwargs: ta.Any,
-    ) -> DeployAtomicPathSwap:
-        dst_path = os.path.abspath(dst_path)
-        if self._root_dir is not None and not dst_path.startswith(check.non_empty_str(self._root_dir)):
-            raise RuntimeError(f'Atomic path swap dst must be in root dir: {dst_path}, {self._root_dir}')
-
-        dst_dir = os.path.dirname(dst_path)
-        if make_dirs:
-            os.makedirs(dst_dir, exist_ok=True)
-        if not os.path.isdir(dst_dir):
-            raise RuntimeError(f'Atomic path swap dst dir does not exist: {dst_dir}')
-
-        if kind == 'dir':
-            tmp_path = tempfile.mkdtemp(prefix=name_hint, dir=self._temp_dir)
-        elif kind == 'file':
-            fd, tmp_path = tempfile.mkstemp(prefix=name_hint, dir=self._temp_dir)
-            os.close(fd)
-        else:
-            raise TypeError(kind)
-
-        return OsRenameDeployAtomicPathSwap(
-            kind,
-            dst_path,
-            tmp_path,
-            **kwargs,
-        )
-
-
 ########################################
 # ../deploy/paths.py
 """
@@ -5687,7 +5489,7 @@ class InjectorBinder:
     def __new__(cls, *args, **kwargs):  # noqa
         raise TypeError
 
-    _FN_TYPES: ta.Tuple[type, ...] = (
+    _FN_TYPES: ta.ClassVar[ta.Tuple[type, ...]] = (
         types.FunctionType,
         types.MethodType,
 
@@ -5709,7 +5511,7 @@ class InjectorBinder:
             cls._FN_TYPES = (*cls._FN_TYPES, icls)
         return icls
 
-    _BANNED_BIND_TYPES: ta.Tuple[type, ...] = (
+    _BANNED_BIND_TYPES: ta.ClassVar[ta.Tuple[type, ...]] = (
         InjectorProvider,
     )
 
@@ -5888,45 +5690,35 @@ def bind_injector_eager_key(key: ta.Any) -> InjectorBinding:
 ##
 
 
-class Injection:
-    def __new__(cls, *args, **kwargs):  # noqa
-        raise TypeError
-
+class InjectionApi:
     # keys
 
-    @classmethod
-    def as_key(cls, o: ta.Any) -> InjectorKey:
+    def as_key(self, o: ta.Any) -> InjectorKey:
         return as_injector_key(o)
 
-    @classmethod
-    def array(cls, o: ta.Any) -> InjectorKey:
+    def array(self, o: ta.Any) -> InjectorKey:
         return dc.replace(as_injector_key(o), array=True)
 
-    @classmethod
-    def tag(cls, o: ta.Any, t: ta.Any) -> InjectorKey:
+    def tag(self, o: ta.Any, t: ta.Any) -> InjectorKey:
         return dc.replace(as_injector_key(o), tag=t)
 
     # bindings
 
-    @classmethod
-    def as_bindings(cls, *args: InjectorBindingOrBindings) -> InjectorBindings:
+    def as_bindings(self, *args: InjectorBindingOrBindings) -> InjectorBindings:
         return as_injector_bindings(*args)
 
-    @classmethod
-    def override(cls, p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
+    def override(self, p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
         return injector_override(p, *args)
 
     # injector
 
-    @classmethod
-    def create_injector(cls, *args: InjectorBindingOrBindings, parent: ta.Optional[Injector] = None) -> Injector:
+    def create_injector(self, *args: InjectorBindingOrBindings, parent: ta.Optional[Injector] = None) -> Injector:
         return _Injector(as_injector_bindings(*args), parent)
 
     # binder
 
-    @classmethod
     def bind(
-            cls,
+            self,
             obj: ta.Any,
             *,
             key: ta.Any = None,
@@ -5961,35 +5753,32 @@ class Injection:
 
     # helpers
 
-    @classmethod
     def bind_factory(
-            cls,
+            self,
             fn: ta.Callable[..., T],
             cls_: U,
             ann: ta.Any = None,
     ) -> InjectorBindingOrBindings:
-        return cls.bind(make_injector_factory(fn, cls_, ann))
+        return self.bind(make_injector_factory(fn, cls_, ann))
 
-    @classmethod
     def bind_array(
-            cls,
+            self,
             obj: ta.Any = None,
             *,
             tag: ta.Any = None,
     ) -> InjectorBindingOrBindings:
         return bind_injector_array(obj, tag=tag)
 
-    @classmethod
     def bind_array_type(
-            cls,
+            self,
             ele: ta.Union[InjectorKey, InjectorKeyCls],
             cls_: U,
             ann: ta.Any = None,
     ) -> InjectorBindingOrBindings:
-        return cls.bind(make_injector_array_type(ele, cls_, ann))
+        return self.bind(make_injector_array_type(ele, cls_, ann))
 
 
-inj = Injection
+inj = InjectionApi()
 
 
 ########################################
@@ -6516,6 +6305,201 @@ class JsonLogFormatter(logging.Formatter):
         return self._json_dumps(dct)
 
 
+########################################
+# ../../../omlish/os/atomics.py
+
+
+##
+
+
+class AtomicPathSwap(abc.ABC):
+    def __init__(
+            self,
+            kind: AtomicPathSwapKind,
+            dst_path: str,
+            *,
+            auto_commit: bool = False,
+    ) -> None:
+        super().__init__()
+
+        self._kind = kind
+        self._dst_path = dst_path
+        self._auto_commit = auto_commit
+
+        self._state: AtomicPathSwapState = 'open'
+
+    def __repr__(self) -> str:
+        return attr_repr(self, 'kind', 'dst_path', 'tmp_path')
+
+    @property
+    def kind(self) -> AtomicPathSwapKind:
+        return self._kind
+
+    @property
+    def dst_path(self) -> str:
+        return self._dst_path
+
+    @property
+    @abc.abstractmethod
+    def tmp_path(self) -> str:
+        raise NotImplementedError
+
+    #
+
+    @property
+    def state(self) -> AtomicPathSwapState:
+        return self._state
+
+    def _check_state(self, *states: AtomicPathSwapState) -> None:
+        if self._state not in states:
+            raise RuntimeError(f'Atomic path swap not in correct state: {self._state}, {states}')
+
+    #
+
+    @abc.abstractmethod
+    def _commit(self) -> None:
+        raise NotImplementedError
+
+    def commit(self) -> None:
+        if self._state == 'committed':
+            return
+        self._check_state('open')
+        try:
+            self._commit()
+        except Exception:  # noqa
+            self._abort()
+            raise
+        else:
+            self._state = 'committed'
+
+    #
+
+    @abc.abstractmethod
+    def _abort(self) -> None:
+        raise NotImplementedError
+
+    def abort(self) -> None:
+        if self._state == 'aborted':
+            return
+        self._abort()
+        self._state = 'aborted'
+
+    #
+
+    def __enter__(self) -> 'AtomicPathSwap':
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if (
+                exc_type is None and
+                self._auto_commit and
+                self._state == 'open'
+        ):
+            self.commit()
+        else:
+            self.abort()
+
+
+class AtomicPathSwapping(abc.ABC):
+    @abc.abstractmethod
+    def begin_atomic_path_swap(
+            self,
+            kind: AtomicPathSwapKind,
+            dst_path: str,
+            *,
+            name_hint: ta.Optional[str] = None,
+            make_dirs: bool = False,
+            **kwargs: ta.Any,
+    ) -> AtomicPathSwap:
+        raise NotImplementedError
+
+
+##
+
+
+class OsRenameAtomicPathSwap(AtomicPathSwap):
+    def __init__(
+            self,
+            kind: AtomicPathSwapKind,
+            dst_path: str,
+            tmp_path: str,
+            **kwargs: ta.Any,
+    ) -> None:
+        if kind == 'dir':
+            check.state(os.path.isdir(tmp_path))
+        elif kind == 'file':
+            check.state(os.path.isfile(tmp_path))
+        else:
+            raise TypeError(kind)
+
+        super().__init__(
+            kind,
+            dst_path,
+            **kwargs,
+        )
+
+        self._tmp_path = tmp_path
+
+    @property
+    def tmp_path(self) -> str:
+        return self._tmp_path
+
+    def _commit(self) -> None:
+        os.rename(self._tmp_path, self._dst_path)
+
+    def _abort(self) -> None:
+        shutil.rmtree(self._tmp_path, ignore_errors=True)
+
+
+class TempDirAtomicPathSwapping(AtomicPathSwapping):
+    def __init__(
+            self,
+            *,
+            temp_dir: ta.Optional[str] = None,
+            root_dir: ta.Optional[str] = None,
+    ) -> None:
+        super().__init__()
+
+        if root_dir is not None:
+            root_dir = os.path.abspath(root_dir)
+        self._root_dir = root_dir
+        self._temp_dir = temp_dir
+
+    def begin_atomic_path_swap(
+            self,
+            kind: AtomicPathSwapKind,
+            dst_path: str,
+            *,
+            name_hint: ta.Optional[str] = None,
+            make_dirs: bool = False,
+            **kwargs: ta.Any,
+    ) -> AtomicPathSwap:
+        dst_path = os.path.abspath(dst_path)
+        if self._root_dir is not None and not dst_path.startswith(check.non_empty_str(self._root_dir)):
+            raise RuntimeError(f'Atomic path swap dst must be in root dir: {dst_path}, {self._root_dir}')
+
+        dst_dir = os.path.dirname(dst_path)
+        if make_dirs:
+            os.makedirs(dst_dir, exist_ok=True)
+        if not os.path.isdir(dst_dir):
+            raise RuntimeError(f'Atomic path swap dst dir does not exist: {dst_dir}')
+
+        if kind == 'dir':
+            tmp_path = tempfile.mkdtemp(prefix=name_hint, dir=self._temp_dir)
+        elif kind == 'file':
+            fd, tmp_path = tempfile.mkstemp(prefix=name_hint, dir=self._temp_dir)
+            os.close(fd)
+        else:
+            raise TypeError(kind)
+
+        return OsRenameAtomicPathSwap(
+            kind,
+            dst_path,
+            tmp_path,
+            **kwargs,
+        )
+
+
 ########################################
 # ../../../omdev/interp/types.py
 
@@ -6752,7 +6736,7 @@ CommandExecutorMap = ta.NewType('CommandExecutorMap', ta.Mapping[ta.Type[Command
 
 class DeployTmpManager(
     SingleDirDeployPathOwner,
-    DeployAtomicPathSwapping,
+    AtomicPathSwapping,
 ):
     def __init__(
             self,
@@ -6765,18 +6749,18 @@ class DeployTmpManager(
         )
 
     @cached_nullary
-    def _swapping(self) -> DeployAtomicPathSwapping:
-        return TempDirDeployAtomicPathSwapping(
+    def _swapping(self) -> AtomicPathSwapping:
+        return TempDirAtomicPathSwapping(
             temp_dir=self._make_dir(),
             root_dir=check.non_empty_str(self._deploy_home),
         )
 
     def begin_atomic_path_swap(
             self,
-            kind: DeployAtomicPathSwapKind,
+            kind: AtomicPathSwapKind,
             dst_path: str,
             **kwargs: ta.Any,
-    ) -> DeployAtomicPathSwap:
+    ) -> AtomicPathSwap:
         return self._swapping().begin_atomic_path_swap(
             kind,
             dst_path,
@@ -8175,7 +8159,7 @@ class DeployGitManager(SingleDirDeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__(
             owned_dir='git',
@@ -8280,7 +8264,7 @@ class DeployVenvManager(DeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__()
 
@@ -9824,7 +9808,7 @@ class DockerManageTargetConnector(ManageTargetConnector):
         if dmt.image is not None:
             sh_parts.extend(['run', '-i', dmt.image])
         elif dmt.container_id is not None:
-            sh_parts.extend(['exec', dmt.container_id])
+            sh_parts.extend(['exec', '-i', dmt.container_id])
         else:
             raise ValueError(dmt)
 
@@ -10044,7 +10028,7 @@ def bind_deploy(
         inj.bind(DeployGitManager, singleton=True),
 
         inj.bind(DeployTmpManager, singleton=True),
-        inj.bind(DeployAtomicPathSwapping, to_key=DeployTmpManager),
+        inj.bind(AtomicPathSwapping, to_key=DeployTmpManager),
 
         inj.bind(DeployVenvManager, singleton=True),
 

ominfra/scripts/supervisor.py

@@ -4548,7 +4548,7 @@ class InjectorBinder:
     def __new__(cls, *args, **kwargs):  # noqa
         raise TypeError
 
-    _FN_TYPES: ta.Tuple[type, ...] = (
+    _FN_TYPES: ta.ClassVar[ta.Tuple[type, ...]] = (
         types.FunctionType,
         types.MethodType,
 
@@ -4570,7 +4570,7 @@ class InjectorBinder:
             cls._FN_TYPES = (*cls._FN_TYPES, icls)
         return icls
 
-    _BANNED_BIND_TYPES: ta.Tuple[type, ...] = (
+    _BANNED_BIND_TYPES: ta.ClassVar[ta.Tuple[type, ...]] = (
         InjectorProvider,
     )
 
@@ -4749,45 +4749,35 @@ def bind_injector_eager_key(key: ta.Any) -> InjectorBinding:
 ##
 
 
-class Injection:
-    def __new__(cls, *args, **kwargs):  # noqa
-        raise TypeError
-
+class InjectionApi:
     # keys
 
-    @classmethod
-    def as_key(cls, o: ta.Any) -> InjectorKey:
+    def as_key(self, o: ta.Any) -> InjectorKey:
         return as_injector_key(o)
 
-    @classmethod
-    def array(cls, o: ta.Any) -> InjectorKey:
+    def array(self, o: ta.Any) -> InjectorKey:
         return dc.replace(as_injector_key(o), array=True)
 
-    @classmethod
-    def tag(cls, o: ta.Any, t: ta.Any) -> InjectorKey:
+    def tag(self, o: ta.Any, t: ta.Any) -> InjectorKey:
         return dc.replace(as_injector_key(o), tag=t)
 
     # bindings
 
-    @classmethod
-    def as_bindings(cls, *args: InjectorBindingOrBindings) -> InjectorBindings:
+    def as_bindings(self, *args: InjectorBindingOrBindings) -> InjectorBindings:
         return as_injector_bindings(*args)
 
-    @classmethod
-    def override(cls, p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
+    def override(self, p: InjectorBindings, *args: InjectorBindingOrBindings) -> InjectorBindings:
         return injector_override(p, *args)
 
     # injector
 
-    @classmethod
-    def create_injector(cls, *args: InjectorBindingOrBindings, parent: ta.Optional[Injector] = None) -> Injector:
+    def create_injector(self, *args: InjectorBindingOrBindings, parent: ta.Optional[Injector] = None) -> Injector:
         return _Injector(as_injector_bindings(*args), parent)
 
     # binder
 
-    @classmethod
     def bind(
-            cls,
+            self,
             obj: ta.Any,
             *,
             key: ta.Any = None,
@@ -4822,35 +4812,32 @@ class Injection:
 
     # helpers
 
-    @classmethod
     def bind_factory(
-            cls,
+            self,
             fn: ta.Callable[..., T],
             cls_: U,
             ann: ta.Any = None,
     ) -> InjectorBindingOrBindings:
-        return cls.bind(make_injector_factory(fn, cls_, ann))
+        return self.bind(make_injector_factory(fn, cls_, ann))
 
-    @classmethod
     def bind_array(
-            cls,
+            self,
             obj: ta.Any = None,
             *,
             tag: ta.Any = None,
     ) -> InjectorBindingOrBindings:
         return bind_injector_array(obj, tag=tag)
 
-    @classmethod
     def bind_array_type(
-            cls,
+            self,
             ele: ta.Union[InjectorKey, InjectorKeyCls],
             cls_: U,
             ann: ta.Any = None,
     ) -> InjectorBindingOrBindings:
-        return cls.bind(make_injector_array_type(ele, cls_, ann))
+        return self.bind(make_injector_array_type(ele, cls_, ann))
 
 
-inj = Injection
+inj = InjectionApi()
 
 
 ########################################

{ominfra-0.0.0.dev160.dist-info → ominfra-0.0.0.dev162.dist-info}/METADATA

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

{ominfra-0.0.0.dev160.dist-info → ominfra-0.0.0.dev162.dist-info}/RECORD

@@ -45,17 +45,16 @@ ominfra/manage/commands/subprocess.py,sha256=yHGMbAI-xKe_9BUs5IZ3Yav8qRE-I9aGnBt
 ominfra/manage/commands/types.py,sha256=XFZPeqeIBAaIIQF3pdPbGxLlb-LCrz6WtlDWO2q_vz0,210
 ominfra/manage/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/deploy/apps.py,sha256=lXcbyX8_wrvvwKtIMM9P_Mh7xL8yj6z9_PFTl_0u-0U,1887
-ominfra/manage/deploy/atomics.py,sha256=j9_L2LXls2dR1I4rQw3msIa2D90JwEO9Mb8KBGOKmyU,5180
 ominfra/manage/deploy/commands.py,sha256=N9qVntnRgJ_IneI7rEQB2Za0oU7gouPfm-sl2MCwW1E,764
 ominfra/manage/deploy/config.py,sha256=aR6ubMEWqkTI55XtcG1Cczn6YhCVN6eSL8DT5EHQJN0,166
-ominfra/manage/deploy/git.py,sha256=T-ad5HtavIsZG3Y1lNimYXvrvklWfm2kZBcV1DLlI-A,3750
-ominfra/manage/deploy/inject.py,sha256=JBc96rxOL7Q6P78yZP4WHp08i2AHvV0JHbRpUzbFblw,1444
+ominfra/manage/deploy/git.py,sha256=6CGLvGH8uYkuT8gyZHybJb7sgUPTtFgy7grj1YHkI9g,3747
+ominfra/manage/deploy/inject.py,sha256=8wuIgdzkDCHbc69nD1meLjwfCOMdWOIfDT5yijL-du8,1441
 ominfra/manage/deploy/interp.py,sha256=OKkenH8YKEW_mEDR6X7_ZLxK9a1Ox6KHSwFPTHT6OzA,1029
 ominfra/manage/deploy/paths.py,sha256=tK8zZFWOHDRdTN5AlTe-3MpgZqovhWrljGosQmeEYvo,6839
 ominfra/manage/deploy/specs.py,sha256=Yq3WiLNJcodUBEsJfP18gPGB3X2ABI1g8YLlsUvJOXg,1230
-ominfra/manage/deploy/tmp.py,sha256=Wg29UMsWL_A8anFsE-XyvkTNsMfH26Nr8BvJxgKNxMo,1248
+ominfra/manage/deploy/tmp.py,sha256=L0pIfQuxQ7_6gC_AAv7eubI37_IPzCVR29hkn1MHL2Q,1230
 ominfra/manage/deploy/types.py,sha256=o95wqvTGNRq8Cxx7VpqeX-9x1tI8k8BpqPFvJZkJYBA,305
-ominfra/manage/deploy/venvs.py,sha256=A1nqFo1Zhxg-Sw3Uyxe6hck4ZEh3bBq8GIjnJPvNLd8,2232
+ominfra/manage/deploy/venvs.py,sha256=ZG9tXhzg0R173T1IFIc5DE45xEuJK97DjlN1cQPAvXI,2229
 ominfra/manage/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/remote/_main.py,sha256=p5KoiS2WMw6QAqlDl_Zun-JybmCsy8awIfpBMLBjGMY,4356
 ominfra/manage/remote/channel.py,sha256=36xR9Ti9ZA8TUBtxmY0u7_3Lv7E6wzQTxlZl7gLR5GE,2224
@@ -72,13 +71,13 @@ ominfra/manage/system/inject.py,sha256=Ksc7Xw_Yh3lWwkTRxB2JCeOYO-nMyKj-Kssd1RDkR
 ominfra/manage/system/packages.py,sha256=HImCsgzXxcfzAoD2PjrstaSE_qgBWtTFUVb0lTEOxkI,4614
 ominfra/manage/system/platforms.py,sha256=F0bgYzUzCjZ2LbWVvnEq2ya_X_LfRW406LQYFL7bG44,1202
 ominfra/manage/targets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/manage/targets/connection.py,sha256=j2QrVS-QFOZJ47TqwaMt8MSPg0whokysGePagjJg3Jg,4637
+ominfra/manage/targets/connection.py,sha256=5e8h9Miej2DKJxZfLyxpGe8y-Y0V_b_AuUW159XVeJM,4643
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
 ominfra/manage/targets/targets.py,sha256=CFl8Uirgn3gfowO1Fn-LBK-6qYqEMFJ9snPUl0gCRuM,1753
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=EC8tSKW3hztBV_Kr_ykK72AmcvnWivUxcz6Sfg3M_hI,155085
-ominfra/scripts/manage.py,sha256=mrjtcbAYVv3RkhEV_tcdPra5lZTJG27k0qgAZsye9zk,293936
-ominfra/scripts/supervisor.py,sha256=npGYEWSZfY7E24mdkJ3HrL_ax6AcqjHfqh-7nZ_sX0U,273987
+ominfra/scripts/manage.py,sha256=mslFxApTHF_954w462BIpZdk9V1oy02fJhcN1N1-Wf4,293592
+ominfra/scripts/supervisor.py,sha256=uPcw4o8gt8xvQ97jXK-WBAaZj3D81Lq9tqDoKxGvLCU,273791
 ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -120,9 +119,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=h6akQJMl0KuWLHS7Ur6WcBZ2JwF0DJQhsPTnFBdGyNk,3571
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev160.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev160.dist-info/METADATA,sha256=eS2Inhifb3u6Dusi7KHOATGGlcALPwhc363rDTOzVz0,731
-ominfra-0.0.0.dev160.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ominfra-0.0.0.dev160.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev160.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev160.dist-info/RECORD,,
+ominfra-0.0.0.dev162.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev162.dist-info/METADATA,sha256=tmh0OqIMABojtwp_fUbGyKMod6s85abgUC2tuyhS30Q,731
+ominfra-0.0.0.dev162.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ominfra-0.0.0.dev162.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev162.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev162.dist-info/RECORD,,

ominfra/manage/deploy/atomics.py

@@ -1,207 +0,0 @@
-# ruff: noqa: UP006 UP007
-import abc
-import os
-import shutil
-import tempfile
-import typing as ta
-
-from omlish.lite.check import check
-from omlish.lite.strings import attr_repr
-
-
-DeployAtomicPathSwapKind = ta.Literal['dir', 'file']
-DeployAtomicPathSwapState = ta.Literal['open', 'committed', 'aborted']  # ta.TypeAlias
-
-
-##
-
-
-class DeployAtomicPathSwap(abc.ABC):
-    def __init__(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            *,
-            auto_commit: bool = False,
-    ) -> None:
-        super().__init__()
-
-        self._kind = kind
-        self._dst_path = dst_path
-        self._auto_commit = auto_commit
-
-        self._state: DeployAtomicPathSwapState = 'open'
-
-    def __repr__(self) -> str:
-        return attr_repr(self, 'kind', 'dst_path', 'tmp_path')
-
-    @property
-    def kind(self) -> DeployAtomicPathSwapKind:
-        return self._kind
-
-    @property
-    def dst_path(self) -> str:
-        return self._dst_path
-
-    @property
-    @abc.abstractmethod
-    def tmp_path(self) -> str:
-        raise NotImplementedError
-
-    #
-
-    @property
-    def state(self) -> DeployAtomicPathSwapState:
-        return self._state
-
-    def _check_state(self, *states: DeployAtomicPathSwapState) -> None:
-        if self._state not in states:
-            raise RuntimeError(f'Atomic path swap not in correct state: {self._state}, {states}')
-
-    #
-
-    @abc.abstractmethod
-    def _commit(self) -> None:
-        raise NotImplementedError
-
-    def commit(self) -> None:
-        if self._state == 'committed':
-            return
-        self._check_state('open')
-        try:
-            self._commit()
-        except Exception:  # noqa
-            self._abort()
-            raise
-        else:
-            self._state = 'committed'
-
-    #
-
-    @abc.abstractmethod
-    def _abort(self) -> None:
-        raise NotImplementedError
-
-    def abort(self) -> None:
-        if self._state == 'aborted':
-            return
-        self._abort()
-        self._state = 'aborted'
-
-    #
-
-    def __enter__(self) -> 'DeployAtomicPathSwap':
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if (
-                exc_type is None and
-                self._auto_commit and
-                self._state == 'open'
-        ):
-            self.commit()
-        else:
-            self.abort()
-
-
-#
-
-
-class DeployAtomicPathSwapping(abc.ABC):
-    @abc.abstractmethod
-    def begin_atomic_path_swap(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            *,
-            name_hint: ta.Optional[str] = None,
-            make_dirs: bool = False,
-            **kwargs: ta.Any,
-    ) -> DeployAtomicPathSwap:
-        raise NotImplementedError
-
-
-##
-
-
-class OsRenameDeployAtomicPathSwap(DeployAtomicPathSwap):
-    def __init__(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            tmp_path: str,
-            **kwargs: ta.Any,
-    ) -> None:
-        if kind == 'dir':
-            check.state(os.path.isdir(tmp_path))
-        elif kind == 'file':
-            check.state(os.path.isfile(tmp_path))
-        else:
-            raise TypeError(kind)
-
-        super().__init__(
-            kind,
-            dst_path,
-            **kwargs,
-        )
-
-        self._tmp_path = tmp_path
-
-    @property
-    def tmp_path(self) -> str:
-        return self._tmp_path
-
-    def _commit(self) -> None:
-        os.rename(self._tmp_path, self._dst_path)
-
-    def _abort(self) -> None:
-        shutil.rmtree(self._tmp_path, ignore_errors=True)
-
-
-class TempDirDeployAtomicPathSwapping(DeployAtomicPathSwapping):
-    def __init__(
-            self,
-            *,
-            temp_dir: ta.Optional[str] = None,
-            root_dir: ta.Optional[str] = None,
-    ) -> None:
-        super().__init__()
-
-        if root_dir is not None:
-            root_dir = os.path.abspath(root_dir)
-        self._root_dir = root_dir
-        self._temp_dir = temp_dir
-
-    def begin_atomic_path_swap(
-            self,
-            kind: DeployAtomicPathSwapKind,
-            dst_path: str,
-            *,
-            name_hint: ta.Optional[str] = None,
-            make_dirs: bool = False,
-            **kwargs: ta.Any,
-    ) -> DeployAtomicPathSwap:
-        dst_path = os.path.abspath(dst_path)
-        if self._root_dir is not None and not dst_path.startswith(check.non_empty_str(self._root_dir)):
-            raise RuntimeError(f'Atomic path swap dst must be in root dir: {dst_path}, {self._root_dir}')
-
-        dst_dir = os.path.dirname(dst_path)
-        if make_dirs:
-            os.makedirs(dst_dir, exist_ok=True)
-        if not os.path.isdir(dst_dir):
-            raise RuntimeError(f'Atomic path swap dst dir does not exist: {dst_dir}')
-
-        if kind == 'dir':
-            tmp_path = tempfile.mkdtemp(prefix=name_hint, dir=self._temp_dir)
-        elif kind == 'file':
-            fd, tmp_path = tempfile.mkstemp(prefix=name_hint, dir=self._temp_dir)
-            os.close(fd)
-        else:
-            raise TypeError(kind)
-
-        return OsRenameDeployAtomicPathSwap(
-            kind,
-            dst_path,
-            tmp_path,
-            **kwargs,
-        )