ominfra 0.0.0.dev160__tar.gz → 0.0.0.dev161__tar.gz

{ominfra-0.0.0.dev160/ominfra.egg-info → ominfra-0.0.0.dev161}/PKG-INFO

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

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev161}/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-0.0.0.dev160 → ominfra-0.0.0.dev161}/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-0.0.0.dev160 → ominfra-0.0.0.dev161}/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-0.0.0.dev160 → ominfra-0.0.0.dev161}/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-0.0.0.dev160 → ominfra-0.0.0.dev161}/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-0.0.0.dev160 → ominfra-0.0.0.dev161}/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
 """
@@ -6516,6 +6318,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 +6749,7 @@ CommandExecutorMap = ta.NewType('CommandExecutorMap', ta.Mapping[ta.Type[Command
 
 class DeployTmpManager(
     SingleDirDeployPathOwner,
-    DeployAtomicPathSwapping,
+    AtomicPathSwapping,
 ):
     def __init__(
             self,
@@ -6765,18 +6762,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 +8172,7 @@ class DeployGitManager(SingleDirDeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__(
             owned_dir='git',
@@ -8280,7 +8277,7 @@ class DeployVenvManager(DeployPathOwner):
             self,
             *,
             deploy_home: ta.Optional[DeployHome] = None,
-            atomics: DeployAtomicPathSwapping,
+            atomics: AtomicPathSwapping,
     ) -> None:
         super().__init__()
 
@@ -9824,7 +9821,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 +10041,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-0.0.0.dev160 → ominfra-0.0.0.dev161/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev161}/ominfra.egg-info/SOURCES.txt

@@ -55,7 +55,6 @@ ominfra/manage/commands/subprocess.py
 ominfra/manage/commands/types.py
 ominfra/manage/deploy/__init__.py
 ominfra/manage/deploy/apps.py
-ominfra/manage/deploy/atomics.py
 ominfra/manage/deploy/commands.py
 ominfra/manage/deploy/config.py
 ominfra/manage/deploy/git.py

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev161}/ominfra.egg-info/requires.txt

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

{ominfra-0.0.0.dev160 → ominfra-0.0.0.dev161}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev160'
+version = '0.0.0.dev161'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev160',
-    'omlish == 0.0.0.dev160',
+    'omdev == 0.0.0.dev161',
+    'omlish == 0.0.0.dev161',
 ]
 
 [project.optional-dependencies]