omdev 0.0.0.dev242__tar.gz → 0.0.0.dev244__tar.gz

{omdev-0.0.0.dev242/omdev.egg-info → omdev-0.0.0.dev244}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev242
+Version: 0.0.0.dev244
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev242
+Requires-Dist: omlish==0.0.0.dev244
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev/ci/docker/cacheserved/cache.py

@@ -6,6 +6,7 @@ import json
 import os.path
 import typing as ta
 
+from omlish.asyncs.asyncio.sockets import asyncio_wait_until_can_connect
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
 from omlish.lite.json import json_dumps_compact
@@ -126,17 +127,14 @@ class CacheServedDockerCache(DockerCache):
             dds_run_task = asyncio.create_task(dds.run())
             try:
                 timeout = Timeout.of(self._config.server_start_timeout)
-                while True:
-                    timeout()
-                    try:
-                        reader, writer = await asyncio.open_connection('localhost', self._config.port)
-                    except Exception as e:  # noqa
-                        log.exception('Failed to connect to cache server - will try again')
-                    else:
-                        writer.close()
-                        await asyncio.wait_for(writer.wait_closed(), timeout=timeout.remaining())
-                        break
-                    await asyncio.sleep(self._config.server_start_sleep)
+
+                await asyncio_wait_until_can_connect(
+                    'localhost',
+                    self._config.port,
+                    timeout=timeout,
+                    on_fail=lambda _: log.exception('Failed to connect to cache server - will try again'),
+                    sleep_s=self._config.server_start_sleep,
+                )
 
                 if (prc := self._config.pull_run_cmd) is not None:
                     pull_cmd = [

omdev-0.0.0.dev244/omdev/home/paths.py

@@ -0,0 +1,70 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - XDG cache root
+"""
+import os.path
+import typing as ta
+
+
+##
+
+
+HOME_DIR_ENV_VAR = 'OMLISH_HOME'
+DEFAULT_HOME_DIR = '~/.omlish'
+
+
+def get_home_dir() -> str:
+    return os.path.expanduser(os.getenv(HOME_DIR_ENV_VAR, DEFAULT_HOME_DIR))
+
+
+#
+
+
+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')
+
+    @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')
+
+    @property
+    def state_dir(self) -> str:
+        return os.path.join(self._home_dir, 'state')
+
+
+def get_home_paths() -> HomePaths:
+    return HomePaths()
+
+
+##
+
+
+CACHE_DIR_ENV_VAR = 'OMLISH_CACHE'
+DEFAULT_CACHE_DIR = '~/.cache/omlish'
+
+
+def get_cache_dir() -> str:
+    return os.path.expanduser(os.getenv(DEFAULT_CACHE_DIR, DEFAULT_CACHE_DIR))

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev/home/secrets.py

@@ -4,7 +4,7 @@ import typing as ta
 from omlish import lang
 from omlish.secrets import all as sec
 
-from .paths import get_config_dir
+from .paths import get_home_paths
 
 
 if ta.TYPE_CHECKING:
@@ -24,7 +24,7 @@ def get_secrets_file() -> str:
     return os.path.expanduser(
         os.getenv(
             SECRETS_FILE_ENV_VAR,
-            os.path.join(get_config_dir(), DEFAULT_SECRETS_FILE_NAME),
+            os.path.join(get_home_paths().config_dir, DEFAULT_SECRETS_FILE_NAME),
         ),
     )
 

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev/home/shadow.py

@@ -1,7 +1,7 @@
 from omlish.configs.shadow import MangledFilesShadowConfigs
 from omlish.configs.shadow import ShadowConfigs
 
-from .paths import get_shadow_dir
+from .paths import get_home_paths
 
 
 ##
@@ -9,6 +9,6 @@ from .paths import get_shadow_dir
 
 def get_shadow_configs() -> ShadowConfigs:
     return MangledFilesShadowConfigs(
-        get_shadow_dir(),
+        get_home_paths().shadow_dir,
         create=True,
     )

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev/oci/tars.py

@@ -79,11 +79,7 @@ class OciDataTarWriter(ExitStacked):
             tar_sha256=self._tw.sha256(),
         )
 
-    def __enter__(self) -> 'OciDataTarWriter':
-        super().__enter__()
-
-        #
-
+    def _enter_contexts(self) -> None:
         self._cw = self._FileWrapper(self._f)
 
         if self._compression is OciCompression.GZIP:
@@ -112,16 +108,12 @@ class OciDataTarWriter(ExitStacked):
         self._tw = self._FileWrapper(self._cf)
 
         self._tf = self._enter_context(
-            tarfile.open(  # type: ignore
+            tarfile.open(  # type: ignore  # noqa
                 fileobj=self._tw,
                 mode='w',
             ),
         )
 
-        #
-
-        return self
-
     def tar_file(self) -> tarfile.TarFile:
         return self._tf
 

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev/scripts/ci.py

@@ -2607,6 +2607,48 @@ class ArgparseCli:
             return fn()
 
 
+########################################
+# ../../../omlish/asyncs/asyncio/sockets.py
+
+
+async def asyncio_wait_until_can_connect(
+        host: ta.Any = None,
+        port: ta.Any = None,
+        *,
+        timeout: ta.Optional[TimeoutLike] = None,
+        on_fail: ta.Optional[ta.Callable[[BaseException], None]] = None,
+        sleep_s: float = .1,
+        exception: ta.Union[ta.Type[BaseException], ta.Tuple[ta.Type[BaseException], ...]] = (Exception,),
+) -> None:
+    timeout = Timeout.of(timeout)
+
+    async def inner():
+        while True:
+            timeout()
+
+            try:
+                reader, writer = await asyncio.open_connection(host, port)
+
+            except asyncio.CancelledError:
+                raise
+
+            except exception as e:  # noqa
+                if on_fail is not None:
+                    on_fail(e)
+
+            else:
+                writer.close()
+                await asyncio.wait_for(writer.wait_closed(), timeout=timeout.or_(None))
+                break
+
+            await asyncio.sleep(min(sleep_s, timeout.remaining()))
+
+    if timeout() != float('inf'):
+        await asyncio.wait_for(inner(), timeout=timeout())
+    else:
+        await inner()
+
+
 ########################################
 # ../../../omlish/asyncs/asyncio/timeouts.py
 
@@ -3041,20 +3083,64 @@ class HttpRequestParser:
 
 
 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
 
@@ -3064,20 +3150,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
 
@@ -6952,11 +7072,7 @@ class OciDataTarWriter(ExitStacked):
             tar_sha256=self._tw.sha256(),
         )
 
-    def __enter__(self) -> 'OciDataTarWriter':
-        super().__enter__()
-
-        #
-
+    def _enter_contexts(self) -> None:
         self._cw = self._FileWrapper(self._f)
 
         if self._compression is OciCompression.GZIP:
@@ -6985,16 +7101,12 @@ class OciDataTarWriter(ExitStacked):
         self._tw = self._FileWrapper(self._cf)
 
         self._tf = self._enter_context(
-            tarfile.open(  # type: ignore
+            tarfile.open(  # type: ignore  # noqa
                 fileobj=self._tw,
                 mode='w',
             ),
         )
 
-        #
-
-        return self
-
     def tar_file(self) -> tarfile.TarFile:
         return self._tf
 
@@ -8800,58 +8912,88 @@ class SocketServer(abc.ABC):
 
     #
 
-    @contextlib.contextmanager
-    def _listen_context(self) -> ta.Iterator[SelectorProtocol]:
-        with contextlib.ExitStack() as es:
-            es.enter_context(self._lock)
-            es.enter_context(self._binder)
+    class PollResult(enum.Enum):
+        TIMEOUT = enum.auto()
+        CONNECTION = enum.auto()
+        ERROR = enum.auto()
+        SHUTDOWN = enum.auto()
 
-            self._binder.listen()
+    class PollContext(ExitStacked, abc.ABC):
+        @abc.abstractmethod
+        def poll(self, timeout: ta.Optional[float] = None) -> 'SocketServer.PollResult':
+            raise NotImplementedError
 
-            self._is_shutdown.clear()
-            try:
-                # XXX: Consider using another file descriptor or connecting to the socket to wake this up instead of
-                # polling. Polling reduces our responsiveness to a shutdown request and wastes cpu at all other times.
-                with self.Selector() as selector:
-                    selector.register(self._binder.fileno(), selectors.EVENT_READ)
+    class _PollContext(PollContext):
+        def __init__(self, server: 'SocketServer') -> None:
+            super().__init__()
 
-                    yield selector
+            self._server = server
 
-            finally:
-                self._is_shutdown.set()
+        _selector: ta.Any = None
 
-    @contextlib.contextmanager
-    def loop_context(self, poll_interval: ta.Optional[float] = None) -> ta.Iterator[ta.Iterator[bool]]:
-        if poll_interval is None:
-            poll_interval = self._poll_interval
+        def _enter_contexts(self) -> None:
+            self._enter_context(self._server._lock)  # noqa: SLF001
+            self._enter_context(self._server._binder)  # noqa: SLF001
 
-        with self._listen_context() as selector:
-            def loop():
-                while not self._should_shutdown:
-                    ready = selector.select(poll_interval)
+            self._server._binder.listen()  # noqa: SLF001
 
-                    # bpo-35017: shutdown() called during select(), exit immediately.
-                    if self._should_shutdown:
-                        break  # type: ignore[unreachable]
+            self._server._is_shutdown.clear()  # noqa: SLF001
+            self._enter_context(defer(self._server._is_shutdown.set))  # noqa
 
-                    if ready:
-                        try:
-                            conn = self._binder.accept()
+            # XXX: Consider using another file descriptor or connecting to the socket to wake this up instead of
+            # polling. Polling reduces our responsiveness to a shutdown request and wastes cpu at all other times.
+            self._selector = self._enter_context(self._server.Selector())
+            self._selector.register(self._server._binder.fileno(), selectors.EVENT_READ)  # noqa: SLF001
 
-                        except OSError as exc:
-                            self._handle_error(exc)
+        def poll(self, timeout: ta.Optional[float] = None) -> 'SocketServer.PollResult':
+            if self._server._should_shutdown:  # noqa: SLF001
+                return SocketServer.PollResult.SHUTDOWN
 
-                            return
+            ready = self._selector.select(timeout)
 
-                        try:
-                            self._handler(conn)
+            # bpo-35017: shutdown() called during select(), exit immediately.
+            if self._server._should_shutdown:  # noqa: SLF001
+                return SocketServer.PollResult.SHUTDOWN  # type: ignore[unreachable]
 
-                        except Exception as exc:  # noqa
-                            self._handle_error(exc, conn)
+            if not ready:
+                return SocketServer.PollResult.TIMEOUT
 
-                            close_socket_immediately(conn.socket)
+            try:
+                conn = self._server._binder.accept()  # noqa: SLF001
+
+            except OSError as exc:
+                self._server._handle_error(exc)  # noqa: SLF001
+
+                return SocketServer.PollResult.ERROR
+
+            try:
+                self._server._handler(conn)  # noqa: SLF001
+
+            except Exception as exc:  # noqa
+                self._server._handle_error(exc, conn)  # noqa: SLF001
+
+                close_socket_immediately(conn.socket)
 
-                    yield bool(ready)
+            return SocketServer.PollResult.CONNECTION
+
+    def poll_context(self) -> PollContext:
+        return self._PollContext(self)
+
+    #
+
+    @contextlib.contextmanager
+    def loop_context(self, poll_interval: ta.Optional[float] = None) -> ta.Iterator[ta.Iterator[bool]]:
+        if poll_interval is None:
+            poll_interval = self._poll_interval
+
+        with self.poll_context() as pc:
+            def loop():
+                while True:
+                    res = pc.poll(poll_interval)
+                    if res in (SocketServer.PollResult.ERROR, SocketServer.PollResult.SHUTDOWN):
+                        return
+                    else:
+                        yield res == SocketServer.PollResult.CONNECTION
 
             yield loop()
 
@@ -10631,6 +10773,7 @@ def make_simple_http_server(
         ignore_ssl_errors: bool = False,
         executor: ta.Optional[cf.Executor] = None,
         use_threads: bool = False,
+        **kwargs: ta.Any,
 ) -> ta.Iterator[SocketServer]:
     check.arg(not (executor is not None and use_threads))
 
@@ -10695,6 +10838,7 @@ def make_simple_http_server(
         server = es.enter_context(SocketServer(
             SocketBinder.of(bind),
             server_handler,
+            **kwargs,
         ))
 
         yield server
@@ -11460,17 +11604,14 @@ class CacheServedDockerCache(DockerCache):
             dds_run_task = asyncio.create_task(dds.run())
             try:
                 timeout = Timeout.of(self._config.server_start_timeout)
-                while True:
-                    timeout()
-                    try:
-                        reader, writer = await asyncio.open_connection('localhost', self._config.port)
-                    except Exception as e:  # noqa
-                        log.exception('Failed to connect to cache server - will try again')
-                    else:
-                        writer.close()
-                        await asyncio.wait_for(writer.wait_closed(), timeout=timeout.remaining())
-                        break
-                    await asyncio.sleep(self._config.server_start_sleep)
+
+                await asyncio_wait_until_can_connect(
+                    'localhost',
+                    self._config.port,
+                    timeout=timeout,
+                    on_fail=lambda _: log.exception('Failed to connect to cache server - will try again'),
+                    sleep_s=self._config.server_start_sleep,
+                )
 
                 if (prc := self._config.pull_run_cmd) is not None:
                     pull_cmd = [

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev/tools/git/cli.py

@@ -22,7 +22,7 @@ from omlish.subprocesses.sync import subprocesses
 
 from ...git.status import GitStatusItem
 from ...git.status import get_git_status
-from ...home.paths import get_config_dir
+from ...home.paths import get_home_paths
 from ...home.shadow import get_shadow_configs
 from . import consts
 from .messages import GitMessageGenerator
@@ -75,7 +75,7 @@ class Cli(ap.Cli):
         if (arg := self._config_file_path_arg) is not None:
             return os.path.expanduser(arg)
         else:
-            return os.path.join(get_config_dir(), 'tools', 'git.yml')
+            return os.path.join(get_home_paths().config_dir, 'tools', 'git.yml')
 
     @cached.function
     def load_home_config_content(self) -> ta.Any:

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev/tools/json/parsing.py

@@ -55,10 +55,8 @@ class DelimitingParser:
 class StreamBuilder(lang.ExitStacked):
     _builder: JsonObjectBuilder | None = None
 
-    def __enter__(self) -> ta.Self:
-        super().__enter__()
+    def _enter_contexts(self) -> None:
         self._builder = self._enter_context(JsonObjectBuilder())
-        return self
 
     def build(self, e: JsonStreamParserEvent) -> ta.Generator[ta.Any, None, None]:
         yield from check.not_none(self._builder)(e)
@@ -69,12 +67,10 @@ class StreamParser(lang.ExitStacked):
     _lex: JsonStreamLexer
     _parse: JsonStreamParser
 
-    def __enter__(self) -> ta.Self:
-        super().__enter__()
+    def _enter_contexts(self) -> None:
         self._decoder = codecs.getincrementaldecoder('utf-8')()
         self._lex = self._enter_context(JsonStreamLexer())
         self._parse = self._enter_context(JsonStreamParser())
-        return self
 
     def parse(self, b: bytes) -> ta.Generator[JsonStreamParserEvent, None, None]:
         for s in self._decoder.decode(b, not b):

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev242
+Version: 0.0.0.dev244
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev242
+Requires-Dist: omlish==0.0.0.dev244
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev242
+omlish==0.0.0.dev244
 
 [all]
 black~=25.1

{omdev-0.0.0.dev242 → omdev-0.0.0.dev244}/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.dev242'
+version = '0.0.0.dev244'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev242',
+    'omlish == 0.0.0.dev244',
 ]
 
 [project.optional-dependencies]