omdev 0.0.0.dev541__tar.gz → 0.0.0.dev543__tar.gz

{omdev-0.0.0.dev541/omdev.egg-info → omdev-0.0.0.dev543}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev541
+Version: 0.0.0.dev543
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev541
+Requires-Dist: omlish==0.0.0.dev543
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev541 → omdev-0.0.0.dev543}/omdev/dockerdev/cli.py

@@ -13,43 +13,11 @@ TODO:
 
 ====
 
-if [ -t 1 ] ; then
-   TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)"
-else
-   TTY_ENV_ARGS=""
-fi
-
-SERVICE_NAME="$(basename "$SCRIPT_DIR")-dev"
-if ! [ $# -eq 0 ] ; then
-    if [ "$1" = "--amd64" ] ; then
-        SERVICE_NAME="$SERVICE_NAME-amd64"
-        shift
-    fi
-fi
-
-CONTAINER_ID=$(docker-compose -f 'docker/compose.yml' ps -q "$SERVICE_NAME")
-if [ -z "$CONTAINER_ID" ] ; then
-    echo "$SERVICE_NAME not running" 1>&2
-    exit 1
-fi
-
-if [ -z "$DOCKER_HOST_PLATFORM" ] ; then
-    if [ $(uname) = "Linux" ] ; then
-        DOCKER_HOST_PLATFORM=linux
-    elif [ $(uname) = "Darwin" ] ; then
-        DOCKER_HOST_PLATFORM=darwin
-    fi
-fi
-
-exec docker exec \
-    $TTY_ENV_ARGS \
-    -e DOCKER_HOST_PLATFORM="$DOCKER_HOST_PLATFORM" \
-    --privileged \
-    --detach-keys 'ctrl-o,ctrl-d' \
-    -it "$CONTAINER_ID" \
-    "$@"
+if [ -t 1 ] ; then TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)" ; fi
+--detach-keys 'ctrl-o,ctrl-d' \
 """
 import os.path
+import platform
 import re
 import shutil
 import subprocess
@@ -155,8 +123,15 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
+
         ap.arg('-C', '--mount-caches', action='store_true'),
+        ap.arg('-D', '--mount-docker-sock', action='store_true'),
+        ap.arg('-P', '--privileged', action='store_true'),
+
+        ap.arg('--no-host-platform', action='store_true'),
+
         ap.arg('-x', '--autoexec', action='append'),
+
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
     )
@@ -182,6 +157,12 @@ class Cli(ap.Cli):
                 '-it',
             ])
 
+        if self.args.privileged:
+            run_args.append('--privileged')
+
+        if self.args.mount_docker_sock:
+            run_args.append('--mount=type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock')
+
         if self.args.mount_caches:
             cache_dir = os.path.join(get_cache_dir(), 'dockerdev')
             for cl, cr in (cfg.cache_mounts or {}).items():
@@ -190,6 +171,9 @@ class Cli(ap.Cli):
                 os.makedirs(cld, exist_ok=True)
                 run_args.append(f'--mount=type=bind,src={cld},dst={cr}')
 
+        if not self.args.no_host_platform:
+            run_args.extend(['-e', f'DOCKER_HOST_PLATFORM={platform.system().lower()}'])
+
         if self.args.autoexec:
             tmp_dir = tempfile.mkdtemp()
             tmp_ep = os.path.join(tmp_dir, 'entrypoint.sh')

{omdev-0.0.0.dev541 → omdev-0.0.0.dev543}/omdev/pyproject/cli.py

@@ -104,7 +104,7 @@ class Run:
 
 
 class PyprojectCli(ArgparseCli):
-    _docker_container = argparse_arg('--_docker_container', help=argparse.SUPPRESS)
+    _current_docker_service = argparse_arg('--_current_docker_service', help=argparse.SUPPRESS)
 
     @argparse_cmd(
         argparse_arg('name'),
@@ -114,11 +114,11 @@ class PyprojectCli(ArgparseCli):
     )
     async def venv(self) -> None:
         venv = Run().venvs()[self.args.name]
-        if (sd := venv.cfg.docker) is not None and sd != (cd := self.args._docker_container):  # noqa
+        if (sd := venv.cfg.docker_service) is not None and sd != (cd := self.args._current_docker_service):  # noqa
             script = ' '.join([
                 'python3',
                 shlex.quote(_script_rel_path()),
-                f'--_docker_container={shlex.quote(sd)}',
+                f'--_current_docker_service={shlex.quote(sd)}',
                 *map(shlex.quote, sys.argv[1:]),
             ])
 

{omdev-0.0.0.dev541 → omdev-0.0.0.dev543}/omdev/pyproject/configs.py

@@ -13,7 +13,7 @@ from ..interp.venvs import InterpVenvConfig
 @dc.dataclass(frozen=True)
 class VenvConfig(InterpVenvConfig):
     inherits: ta.Optional[ta.Sequence[str]] = None
-    docker: ta.Optional[str] = None
+    docker_service: ta.Optional[str] = None
     srcs: ta.Optional[ta.List[str]] = None
 
 

{omdev-0.0.0.dev541 → omdev-0.0.0.dev543}/omdev/scripts/ci.py

@@ -93,7 +93,7 @@ def __omlish_amalg__():  # noqa
             dict(path='github/env.py', sha1='c7a2389048f008f46f59f6bcc11e0d15655f2b1c'),
             dict(path='shell.py', sha1='a59e59b812394d0502837f4c198e1cf604f90227'),
             dict(path='../oci/compression.py', sha1='7d165bc51a77db13ff45927daecc42839cfd75ea'),
-            dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='34691d4d0e5bab68f14e193a6200df040cfd0136'),
+            dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='a093aa6b49e25b3206f59b703b281d569c386838'),
             dict(path='../../omlish/docker/ports.py', sha1='a3202c69b85bc4f1034479df3400fddc86130e5c'),
             dict(path='../../omlish/http/urllib.py', sha1='25431c5bdc7dd5cbecfcb8c0bdffaabf8c1691b9'),
             dict(path='../../omlish/http/versions.py', sha1='5b1659b81eb197c6880fbe78684a1348595ec804'),
@@ -494,6 +494,79 @@ async def asyncio_wait_maybe_concurrent(
         return await asyncio_wait_concurrent(awaitables, concurrency)
 
 
+##
+
+
+async def _asyncio_await_finalizer_shielded(
+        awaitable: ta.Awaitable[ta.Any],
+        *,
+        timeout: ta.Optional[float] = None,
+) -> None:
+    task = asyncio.create_task(awaitable)  # type: ignore  # noqa
+
+    if timeout is None:
+        try:
+            await asyncio.shield(task)
+        except asyncio.CancelledError:
+            try:
+                await task
+            finally:
+                raise
+
+    else:
+        deadline = time.monotonic() + timeout
+
+        def remaining() -> float:
+            return max(0., deadline - time.monotonic())
+
+        try:
+            await asyncio.wait_for(asyncio.shield(task), timeout=remaining())
+        except asyncio.CancelledError:
+            try:
+                await asyncio.wait_for(task, timeout=remaining())
+            finally:
+                raise
+
+
+@dc.dataclass()
+class AsyncioShieldedFinallyCancelledError(asyncio.CancelledError):
+    cleanup_exc: BaseException
+
+
+@contextlib.asynccontextmanager
+async def asyncio_shielded_finally(
+        fn: ta.Callable[[], ta.Awaitable[ta.Any]],
+        *,
+        timeout: ta.Optional[float] = None,
+) -> ta.AsyncIterator[None]:
+    raised = False
+
+    try:
+        yield
+
+    except asyncio.CancelledError as e:
+        raised = True
+        try:
+            await _asyncio_await_finalizer_shielded(fn(), timeout=timeout)
+        except BaseException as e2:  # noqa
+            raise AsyncioShieldedFinallyCancelledError(e2) from e
+        else:
+            raise
+
+    except Exception as e:  # noqa
+        raised = True
+        try:
+            await _asyncio_await_finalizer_shielded(fn(), timeout=timeout)
+        except BaseException as e2:  # noqa
+            raise e2 from e
+        else:
+            raise
+
+    finally:
+        if not raised:
+            await _asyncio_await_finalizer_shielded(fn(), timeout=timeout)
+
+
 ########################################
 # ../../../omlish/docker/ports.py
 """

{omdev-0.0.0.dev541 → omdev-0.0.0.dev543}/omdev/scripts/lib/io/pipelines.py

@@ -61,7 +61,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../logs/contexts.py', sha1='1000a6d5ddfb642865ca532e34b1d50759781cf0'),
             dict(path='../../logs/utils.py', sha1='9b879044cbdc3172fd7282c7f2a4880b81261cdd'),
             dict(path='bytes/queues.py', sha1='ea3b53a155622376836ba9e3499b85220f37b1fd'),
-            dict(path='handlers/flatmap.py', sha1='7c9957c9e5136d1fa8ca51997914b4e9a5065843'),
+            dict(path='handlers/flatmap.py', sha1='118478ac94449a9a0b5ba44f5f3e8a5d69bb6f65'),
             dict(path='../streams/direct.py', sha1='b01937212493e9a41644ac4e366e4cbab10332ce'),
             dict(path='../streams/scanning.py', sha1='00522802dff772689be66151430754d4f9706dbc'),
             dict(path='../../logs/base.py', sha1='eaa2ce213235815e2f86c50df6c41cfe26a43ba2'),
@@ -71,7 +71,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../logs/std/loggers.py', sha1='dbdfc66188e6accb75d03454e43221d3fba0f011'),
             dict(path='bytes/decoders.py', sha1='6f6d8bc1adc6a5277543389814bc26ef63e34561'),
             dict(path='../../logs/modules.py', sha1='dd7d5f8e63fe8829dfb49460f3929ab64b68ee14'),
-            dict(path='drivers/asyncio.py', sha1='59e80c4ac127e727676f17e956783f3aa39b4088'),
+            dict(path='drivers/asyncio.py', sha1='44e86ab5b903ea2780fc586aed267f72d501d21f'),
             dict(path='_amalg.py', sha1='14b67747b1e3b3c1483050a7948a29888d732ed9'),
         ],
     )
@@ -5521,12 +5521,13 @@ class FlatMapIoPipelineHandlers(NamespaceClass):
     )
 
     @classmethod
-    def _add_drop_filters(
+    def add_filters(
             cls,
             fn: FlatMapIoPipelineHandlerFn,
             *,
             filter_type: ta.Optional[ta.Union[type, ta.Tuple[type, ...]]] = None,
             filter: ta.Optional[IoPipelineHandlerFn[ta.Any, bool]] = None,  # noqa
+            not_must_propagate: bool = False,
     ) -> FlatMapIoPipelineHandlerFn:
         if filter is not None:
             fn = FlatMapIoPipelineHandlerFns.filter(filter, fn)
@@ -5534,10 +5535,13 @@ class FlatMapIoPipelineHandlers(NamespaceClass):
         if filter_type is not None:
             fn = FlatMapIoPipelineHandlerFns.filter_type(filter_type, fn)
 
-        fn = FlatMapIoPipelineHandlerFns.filter(cls._NOT_MUST_PROPAGATE, fn)
+        if not_must_propagate:
+            fn = FlatMapIoPipelineHandlerFns.filter(cls._NOT_MUST_PROPAGATE, fn)
 
         return fn
 
+    #
+
     @classmethod
     def drop(
             cls,
@@ -5548,10 +5552,33 @@ class FlatMapIoPipelineHandlers(NamespaceClass):
     ) -> IoPipelineHandler:
         return cls.new(
             direction,
-            cls._add_drop_filters(
+            cls.add_filters(
                 FlatMapIoPipelineHandlerFns.drop(),
                 filter=filter,
                 filter_type=filter_type,
+                not_must_propagate=True,
+            ),
+        )
+
+    @classmethod
+    def apply_and_drop(
+            cls,
+            direction: IoPipelineDirectionOrDuplex,
+            fn: IoPipelineHandlerFn[ta.Any, None],
+            *,
+            filter_type: ta.Optional[ta.Union[type, ta.Tuple[type, ...]]] = None,
+            filter: ta.Optional[IoPipelineHandlerFn[ta.Any, bool]] = None,  # noqa
+    ) -> IoPipelineHandler:
+        return cls.new(
+            direction,
+            cls.add_filters(
+                FlatMapIoPipelineHandlerFns.compose(
+                    FlatMapIoPipelineHandlerFns.apply(fn),
+                    FlatMapIoPipelineHandlerFns.drop(),
+                ),
+                filter=filter,
+                filter_type=filter_type,
+                not_must_propagate=True,
             ),
         )
 
@@ -5564,13 +5591,14 @@ class FlatMapIoPipelineHandlers(NamespaceClass):
     ) -> IoPipelineHandler:
         return cls.new(
             'inbound',
-            cls._add_drop_filters(
+            cls.add_filters(
                 FlatMapIoPipelineHandlerFns.compose(
                     FlatMapIoPipelineHandlerFns.feed_out(),
                     FlatMapIoPipelineHandlerFns.drop(),
                 ),
                 filter=filter,
                 filter_type=filter_type,
+                not_must_propagate=True,
             ),
         )
 
@@ -8169,14 +8197,14 @@ class AsyncioStreamIoPipelineDriver(Abstract):
             fut.set_exception(e)
             raise
 
-    async def feed_in(self, *msgs: ta.Any) -> None:
+    def enqueue_waitable(self, *msgs: ta.Any) -> 'asyncio.Future[None]':
         check.state(not self._shutdown_event.is_set())
 
         fut: asyncio.Future[None] = asyncio.Future()
         self._command_queue.put_nowait(AsyncioStreamIoPipelineDriver._FeedInCommand(msgs, fut=fut))
-        await fut
+        return fut
 
-    def feed_in_nowait(self, *msgs: ta.Any) -> None:
+    def enqueue(self, *msgs: ta.Any) -> None:
         check.state(not self._shutdown_event.is_set())
 
         self._command_queue.put_nowait(AsyncioStreamIoPipelineDriver._FeedInCommand(msgs))