ominfra 0.0.0.dev242__py3-none-any.whl → 0.0.0.dev244__py3-none-any.whl

ominfra/manage/main.py

@@ -11,7 +11,7 @@ import os.path
 import sys
 import typing as ta
 
-from omdev.home.paths import get_config_dir
+from omdev.home.paths import get_home_paths
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
 from omlish.argparse.cli import argparse_cmd
@@ -44,7 +44,7 @@ class MainCli(ArgparseCli):
     @cached_nullary
     def config(self) -> ManageConfig:
         if (cf := self.config_file) is None:
-            cf = os.path.join(get_config_dir(), 'manage', 'manage.yml')
+            cf = os.path.join(get_home_paths().config_dir, 'manage', 'manage.yml')
             if not os.path.isfile(cf):
                 cf = None
 

ominfra/scripts/journald2aws.py

@@ -3025,20 +3025,64 @@ class IncrementalWriteBuffer:
 
 
 class ExitStacked:
+    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
+
+        for a in ('__enter__', '__exit__'):
+            for b in cls.__bases__:
+                if b is ExitStacked:
+                    continue
+                try:
+                    fn = getattr(b, a)
+                except AttributeError:
+                    pass
+                else:
+                    if fn is not getattr(ExitStacked, a):
+                        raise TypeError(f'ExitStacked subclass {cls} must not not override {a} via {b}')
+
     _exit_stack: ta.Optional[contextlib.ExitStack] = None
 
+    @contextlib.contextmanager
+    def _exit_stacked_init_wrapper(self) -> ta.Iterator[None]:
+        """
+        Overridable wrapper around __enter__ which deliberately does not have access to an _exit_stack yet. Intended for
+        things like wrapping __enter__ in a lock.
+        """
+
+        yield
+
+    @ta.final
     def __enter__(self: ExitStackedT) -> ExitStackedT:
-        check.state(self._exit_stack is None)
-        es = self._exit_stack = contextlib.ExitStack()
-        es.__enter__()
-        return self
+        """
+        Final because any contexts entered during this init must be exited if any exception is thrown, and user
+        overriding would likely interfere with that. Override `_enter_contexts` for such init.
+        """
+
+        with self._exit_stacked_init_wrapper():
+            check.state(self._exit_stack is None)
+            es = self._exit_stack = contextlib.ExitStack()
+            es.__enter__()
+            try:
+                self._enter_contexts()
+            except Exception:  # noqa
+                es.__exit__(*sys.exc_info())
+                raise
+            return self
 
+    @ta.final
     def __exit__(self, exc_type, exc_val, exc_tb):
         if (es := self._exit_stack) is None:
             return None
-        self._exit_contexts()
+        try:
+            self._exit_contexts()
+        except Exception:  # noqa
+            es.__exit__(*sys.exc_info())
+            raise
         return es.__exit__(exc_type, exc_val, exc_tb)
 
+    def _enter_contexts(self) -> None:
+        pass
+
     def _exit_contexts(self) -> None:
         pass
 
@@ -3048,20 +3092,54 @@ class ExitStacked:
 
 
 class AsyncExitStacked:
+    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
+
+        for a in ('__aenter__', '__aexit__'):
+            for b in cls.__bases__:
+                if b is AsyncExitStacked:
+                    continue
+                try:
+                    fn = getattr(b, a)
+                except AttributeError:
+                    pass
+                else:
+                    if fn is not getattr(AsyncExitStacked, a):
+                        raise TypeError(f'AsyncExitStacked subclass {cls} must not not override {a} via {b}')
+
     _exit_stack: ta.Optional[contextlib.AsyncExitStack] = None
 
+    @contextlib.asynccontextmanager
+    async def _async_exit_stacked_init_wrapper(self) -> ta.AsyncGenerator[None, None]:
+        yield
+
+    @ta.final
     async def __aenter__(self: AsyncExitStackedT) -> AsyncExitStackedT:
-        check.state(self._exit_stack is None)
-        es = self._exit_stack = contextlib.AsyncExitStack()
-        await es.__aenter__()
-        return self
+        async with self._async_exit_stacked_init_wrapper():
+            check.state(self._exit_stack is None)
+            es = self._exit_stack = contextlib.AsyncExitStack()
+            await es.__aenter__()
+            try:
+                await self._async_enter_contexts()
+            except Exception:  # noqa
+                await es.__aexit__(*sys.exc_info())
+                raise
+            return self
 
+    @ta.final
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         if (es := self._exit_stack) is None:
             return None
-        await self._async_exit_contexts()
+        try:
+            await self._async_exit_contexts()
+        except Exception:  # noqa
+            await es.__aexit__(*sys.exc_info())
+            raise
         return await es.__aexit__(exc_type, exc_val, exc_tb)
 
+    async def _async_enter_contexts(self) -> None:
+        pass
+
     async def _async_exit_contexts(self) -> None:
         pass
 
@@ -4078,9 +4156,10 @@ class ThreadWorker(ExitStacked, abc.ABC):
 
     #
 
-    def __enter__(self: ThreadWorkerT) -> ThreadWorkerT:
+    @contextlib.contextmanager
+    def _exit_stacked_init_wrapper(self) -> ta.Iterator[None]:
         with self._lock:
-            return super().__enter__()  # noqa
+            yield
 
     #
 

ominfra/scripts/manage.py

@@ -173,20 +173,41 @@ def get_home_dir() -> str:
 #
 
 
-def get_config_dir() -> str:
-    return os.path.join(get_home_dir(), 'config')
+class HomePaths:
+    def __init__(self, home_dir: ta.Optional[str] = None) -> None:
+        super().__init__()
+
+        if home_dir is None:
+            home_dir = get_home_dir()
+        self._home_dir = home_dir
+
+    @property
+    def home_dir(self) -> str:
+        return self._home_dir
 
+    @property
+    def config_dir(self) -> str:
+        return os.path.join(self._home_dir, 'config')
+
+    @property
+    def log_dir(self) -> str:
+        return os.path.join(self._home_dir, 'log')
 
-def get_run_dir() -> str:
-    return os.path.join(get_home_dir(), 'run')
+    @property
+    def run_dir(self) -> str:
+        return os.path.join(self._home_dir, 'run')
 
+    @property
+    def shadow_dir(self) -> str:
+        return os.path.join(self._home_dir, 'shadow')
 
-def get_shadow_dir() -> str:
-    return os.path.join(get_home_dir(), 'shadow')
+    @property
+    def state_dir(self) -> str:
+        return os.path.join(self._home_dir, 'state')
 
 
-def get_state_dir() -> str:
-    return os.path.join(get_home_dir(), 'state')
+def get_home_paths() -> HomePaths:
+    return HomePaths()
 
 
 ##
@@ -5511,20 +5532,64 @@ DEFAULT_CONFIG_RENDERER = SwitchedConfigRenderer(DEFAULT_CONFIG_RENDERERS)
 
 
 class ExitStacked:
+    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
+
+        for a in ('__enter__', '__exit__'):
+            for b in cls.__bases__:
+                if b is ExitStacked:
+                    continue
+                try:
+                    fn = getattr(b, a)
+                except AttributeError:
+                    pass
+                else:
+                    if fn is not getattr(ExitStacked, a):
+                        raise TypeError(f'ExitStacked subclass {cls} must not not override {a} via {b}')
+
     _exit_stack: ta.Optional[contextlib.ExitStack] = None
 
+    @contextlib.contextmanager
+    def _exit_stacked_init_wrapper(self) -> ta.Iterator[None]:
+        """
+        Overridable wrapper around __enter__ which deliberately does not have access to an _exit_stack yet. Intended for
+        things like wrapping __enter__ in a lock.
+        """
+
+        yield
+
+    @ta.final
     def __enter__(self: ExitStackedT) -> ExitStackedT:
-        check.state(self._exit_stack is None)
-        es = self._exit_stack = contextlib.ExitStack()
-        es.__enter__()
-        return self
+        """
+        Final because any contexts entered during this init must be exited if any exception is thrown, and user
+        overriding would likely interfere with that. Override `_enter_contexts` for such init.
+        """
+
+        with self._exit_stacked_init_wrapper():
+            check.state(self._exit_stack is None)
+            es = self._exit_stack = contextlib.ExitStack()
+            es.__enter__()
+            try:
+                self._enter_contexts()
+            except Exception:  # noqa
+                es.__exit__(*sys.exc_info())
+                raise
+            return self
 
+    @ta.final
     def __exit__(self, exc_type, exc_val, exc_tb):
         if (es := self._exit_stack) is None:
             return None
-        self._exit_contexts()
+        try:
+            self._exit_contexts()
+        except Exception:  # noqa
+            es.__exit__(*sys.exc_info())
+            raise
         return es.__exit__(exc_type, exc_val, exc_tb)
 
+    def _enter_contexts(self) -> None:
+        pass
+
     def _exit_contexts(self) -> None:
         pass
 
@@ -5534,20 +5599,54 @@ class ExitStacked:
 
 
 class AsyncExitStacked:
+    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
+
+        for a in ('__aenter__', '__aexit__'):
+            for b in cls.__bases__:
+                if b is AsyncExitStacked:
+                    continue
+                try:
+                    fn = getattr(b, a)
+                except AttributeError:
+                    pass
+                else:
+                    if fn is not getattr(AsyncExitStacked, a):
+                        raise TypeError(f'AsyncExitStacked subclass {cls} must not not override {a} via {b}')
+
     _exit_stack: ta.Optional[contextlib.AsyncExitStack] = None
 
+    @contextlib.asynccontextmanager
+    async def _async_exit_stacked_init_wrapper(self) -> ta.AsyncGenerator[None, None]:
+        yield
+
+    @ta.final
     async def __aenter__(self: AsyncExitStackedT) -> AsyncExitStackedT:
-        check.state(self._exit_stack is None)
-        es = self._exit_stack = contextlib.AsyncExitStack()
-        await es.__aenter__()
-        return self
+        async with self._async_exit_stacked_init_wrapper():
+            check.state(self._exit_stack is None)
+            es = self._exit_stack = contextlib.AsyncExitStack()
+            await es.__aenter__()
+            try:
+                await self._async_enter_contexts()
+            except Exception:  # noqa
+                await es.__aexit__(*sys.exc_info())
+                raise
+            return self
 
+    @ta.final
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         if (es := self._exit_stack) is None:
             return None
-        await self._async_exit_contexts()
+        try:
+            await self._async_exit_contexts()
+        except Exception:  # noqa
+            await es.__aexit__(*sys.exc_info())
+            raise
         return await es.__aexit__(exc_type, exc_val, exc_tb)
 
+    async def _async_enter_contexts(self) -> None:
+        pass
+
     async def _async_exit_contexts(self) -> None:
         pass
 
@@ -13448,7 +13547,7 @@ class MainCli(ArgparseCli):
     @cached_nullary
     def config(self) -> ManageConfig:
         if (cf := self.config_file) is None:
-            cf = os.path.join(get_config_dir(), 'manage', 'manage.yml')
+            cf = os.path.join(get_home_paths().config_dir, 'manage', 'manage.yml')
             if not os.path.isfile(cf):
                 cf = None
 

ominfra/threadworkers.py

@@ -10,6 +10,7 @@ TODO:
   - shared stop_event?
 """
 import abc
+import contextlib
 import dataclasses as dc
 import threading
 import time
@@ -48,9 +49,10 @@ class ThreadWorker(ExitStacked, abc.ABC):
 
     #
 
-    def __enter__(self: ThreadWorkerT) -> ThreadWorkerT:
+    @contextlib.contextmanager
+    def _exit_stacked_init_wrapper(self) -> ta.Iterator[None]:
         with self._lock:
-            return super().__enter__()  # noqa
+            yield
 
     #
 

{ominfra-0.0.0.dev242.dist-info → ominfra-0.0.0.dev244.dist-info}/METADATA

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

{ominfra-0.0.0.dev242.dist-info → ominfra-0.0.0.dev244.dist-info}/RECORD

@@ -3,7 +3,7 @@ ominfra/__about__.py,sha256=6i1AoruFYQCd-PyhhbDQDWY2d1tiQu9nkwWr-fXAqfY,705
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/pyremote.py,sha256=qjY3Bj0GhuYznQ3bhqXmU9zyIVZkhD9Wv76QUG34ZME,15198
 ominfra/systemd.py,sha256=d61NVrJoItzSaqhMDgKGrQjbrxEVAujUMDsj8WggXos,1022
-ominfra/threadworkers.py,sha256=oX4ubZn7h932saXpRIJu2MNhBExgGGMuGhdXarZxLJw,4948
+ominfra/threadworkers.py,sha256=ADWHAdvjzPxm94yJcEt5_nM7q7aahdQUNP_EGQeOWAw,4974
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/__main__.py,sha256=HXMoxEl9KHhv6zOOPQxiJAftfR2SjBqeVTYw-og9aFw,163
@@ -52,7 +52,7 @@ ominfra/manage/bootstrap.py,sha256=1RIRhVkUZjxZcZerHMg8U6xgWhhemGgPN5cDye8dQ68,4
 ominfra/manage/bootstrap_.py,sha256=B9UfR9J7mS3J54PFaSe1MQS5lCnKgxt5dDRJ9mnHYwg,656
 ominfra/manage/config.py,sha256=1y2N_8nXHBZc6YbW6BaRZoDDCTBmiHuWtTOQ7zdr5VE,184
 ominfra/manage/inject.py,sha256=_FVaMZUBKi-oObv14H77luWYCodxNJJD1t4pNQzckFE,2030
-ominfra/manage/main.py,sha256=sA0Kv3g4KAtRN5AKgzEF0r0g0pviKCtlUrr9SJkqmIo,4436
+ominfra/manage/main.py,sha256=jWraEP0l9YwjbLuPpnYUR2PTwIcKEpaHBUk2qYnkKO0,4447
 ominfra/manage/marshal.py,sha256=WKj7IU9bo4fBMSSzT6ZMm_WFalXIJZ-V7j8oi92fNhk,305
 ominfra/manage/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/commands/base.py,sha256=LtaI0AgnplttQK7gNncNItq8yuTZQimJTaprVpZktI8,3993
@@ -112,8 +112,8 @@ ominfra/manage/targets/connection.py,sha256=rVI1YJxFClcF-sdttqWyIz9_XjPI01GUdwxY
 ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhhMcE,1561
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=Hub3-WL7ZzxU9-UaIB78eT9grq4XldTyd3EZmcY2ulI,164834
-ominfra/scripts/manage.py,sha256=REje_aRYaa1k0gXdLtZfZo6TU2K7hsR0LoCIq0BEZVI,374968
+ominfra/scripts/journald2aws.py,sha256=i1WBsTvVx8XetO_Kl0hGPHGDAFhPybyMBm60bvg_Hi8,167534
+ominfra/scripts/manage.py,sha256=2uU_QU9C6s1DiLz9wV_zLkfWNZZ91MZHiCIjuKLqDJw,378202
 ominfra/scripts/supervisor.py,sha256=XQGNjIHFvyy7S5uv7bQ4hOne4hqWqny1SLcNlr1vX7w,296335
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev242.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev242.dist-info/METADATA,sha256=LH7niglYt6yUAtKp3nsbr4-xGYyk-3JFjgMm9BNZvl4,731
-ominfra-0.0.0.dev242.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-ominfra-0.0.0.dev242.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev242.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev242.dist-info/RECORD,,
+ominfra-0.0.0.dev244.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev244.dist-info/METADATA,sha256=E34HYzv8JQRFxgXeUiuROpXUGG9EMn6KZfNKbUMGFkY,731
+ominfra-0.0.0.dev244.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+ominfra-0.0.0.dev244.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev244.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev244.dist-info/RECORD,,