omdev 0.0.0.dev542__tar.gz → 0.0.0.dev544__tar.gz

{omdev-0.0.0.dev542/omdev.egg-info → omdev-0.0.0.dev544}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev542
+Version: 0.0.0.dev544
 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.dev542
+Requires-Dist: omlish==0.0.0.dev544
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev542 → omdev-0.0.0.dev544}/omdev/.omlish-manifests.json

@@ -536,7 +536,7 @@
     "module": ".tools.shadow",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/shadow.py",
-    "line": 68,
+    "line": 92,
     "value": {
       "!.cli.types.CliModule": {
         "name": "shadow",

{omdev-0.0.0.dev542 → omdev-0.0.0.dev544}/omdev/home/paths.py

@@ -36,25 +36,35 @@ class HomePaths:
     def home_dir(self) -> str:
         return self._home_dir
 
+    config_subdir: ta.Final = 'config'
+
     @property
     def config_dir(self) -> str:
-        return os.path.join(self._home_dir, 'config')
+        return os.path.join(self._home_dir, self.config_subdir)
+
+    log_subdir: ta.Final = 'log'
 
     @property
     def log_dir(self) -> str:
-        return os.path.join(self._home_dir, 'log')
+        return os.path.join(self._home_dir, self.log_subdir)
+
+    run_subdir: ta.Final = 'run'
 
     @property
     def run_dir(self) -> str:
-        return os.path.join(self._home_dir, 'run')
+        return os.path.join(self._home_dir, self.run_subdir)
+
+    shadow_subdir: ta.Final = 'shadow'
 
     @property
     def shadow_dir(self) -> str:
-        return os.path.join(self._home_dir, 'shadow')
+        return os.path.join(self._home_dir, self.shadow_subdir)
+
+    state_subdir: ta.Final = 'state'
 
     @property
     def state_dir(self) -> str:
-        return os.path.join(self._home_dir, 'state')
+        return os.path.join(self._home_dir, self.state_subdir)
 
 
 def get_home_paths() -> HomePaths:

omdev-0.0.0.dev544/omdev/home/shadow.py

@@ -0,0 +1,24 @@
+from omlish.configs.shadow import FileShadowConfigs
+from omlish.configs.shadow import FileShadowConfigsImpl
+from omlish.configs.shadow import ShadowConfigs
+from omlish.lite.check import check
+from omlish.os.shadow import ManglingShadowPaths
+from omlish.os.shadow import ShadowPaths
+
+from .paths import HomePaths
+from .paths import get_home_paths
+
+
+##
+
+
+def get_shadow_paths() -> ShadowPaths:
+    return ManglingShadowPaths(get_home_paths().shadow_dir)
+
+
+def get_shadow_configs() -> ShadowConfigs:
+    return FileShadowConfigsImpl(get_shadow_paths(), HomePaths.config_subdir)
+
+
+def get_file_shadow_configs() -> FileShadowConfigs:
+    return check.isinstance(get_shadow_configs(), FileShadowConfigs)

{omdev-0.0.0.dev542 → omdev-0.0.0.dev544}/omdev/scripts/ci.py

@@ -93,11 +93,11 @@ 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='1ab917e62b40dae3744ba2eb3d10c85ddffe08a4'),
+            dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='a093aa6b49e25b3206f59b703b281d569c386838'),
             dict(path='../../omlish/docker/ports.py', sha1='a3202c69b85bc4f1034479df3400fddc86130e5c'),
+            dict(path='../../omlish/http/coro/_pushback.py', sha1='783fe8a40fa9f2febf035f4553c53c73b9bd58e1'),
             dict(path='../../omlish/http/urllib.py', sha1='25431c5bdc7dd5cbecfcb8c0bdffaabf8c1691b9'),
             dict(path='../../omlish/http/versions.py', sha1='5b1659b81eb197c6880fbe78684a1348595ec804'),
-            dict(path='../../omlish/io/pushback.py', sha1='783fe8a40fa9f2febf035f4553c53c73b9bd58e1'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
@@ -173,7 +173,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/building.py', sha1='b4fea06c03ba02d3ecfc6d10d955dc76f263846a'),
             dict(path='../oci/loading.py', sha1='64d806ffad8d24087ccc29f759f672e6d795bee2'),
             dict(path='../../omlish/formats/yaml/goyaml/parsing.py', sha1='c92e4772e2d50f080bc1ca8a317d0c7aea5b710a'),
-            dict(path='../../omlish/http/coro/server/sockets.py', sha1='512e6fdd4ad9a533b81a584e45c7d7e9b0188c15'),
+            dict(path='../../omlish/http/coro/server/sockets.py', sha1='bb0915b307622067c5460387ed0014f954167eb5'),
             dict(path='../../omlish/logs/asyncs.py', sha1='8376df395029a9d0957e2338adede895a9364215'),
             dict(path='../../omlish/logs/std/loggers.py', sha1='dbdfc66188e6accb75d03454e43221d3fba0f011'),
             dict(path='../../omlish/subprocesses/asyncs.py', sha1='bba44d524c24c6ac73168aee6343488414e5bf48'),
@@ -497,41 +497,74 @@ async def asyncio_wait_maybe_concurrent(
 ##
 
 
-@contextlib.asynccontextmanager
-async def asyncio_shielded_finally(
-    fn: ta.Callable[[], ta.Awaitable[ta.Any]],
-    *,
-    timeout: ta.Optional[float] = 5,
-) -> ta.AsyncIterator[None]:
-    try:
-        yield
+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
 
-    finally:
-        end_task = asyncio.create_task(fn())  # 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
 
-        if timeout is None:
+        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.shield(end_task)
+                await asyncio.wait_for(task, timeout=remaining())
+            finally:
+                raise
 
-            except asyncio.CancelledError:
-                try:
-                    await end_task
 
-                finally:
-                    raise
+@dc.dataclass()
+class AsyncioShieldedFinallyCancelledError(asyncio.CancelledError):
+    cleanup_exc: BaseException
 
-        else:
-            dl = time.monotonic() + timeout
 
-            try:
-                await asyncio.wait_for(asyncio.shield(end_task), timeout=time.monotonic() - dl)
+@contextlib.asynccontextmanager
+async def asyncio_shielded_finally(
+        fn: ta.Callable[[], ta.Awaitable[ta.Any]],
+        *,
+        timeout: ta.Optional[float] = None,
+) -> ta.AsyncIterator[None]:
+    raised = False
 
-            except asyncio.CancelledError:
-                try:
-                    await asyncio.wait_for(end_task, timeout=time.monotonic() - dl)
+    try:
+        yield
 
-                finally:
-                    raise
+    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)
 
 
 ########################################
@@ -603,128 +636,7 @@ class DockerPortRelay:
 
 
 ########################################
-# ../../../omlish/http/urllib.py
-
-
-##
-
-
-class NonRaisingUrllibErrorProcessor(urllib.request.HTTPErrorProcessor):
-    """
-    https://stackoverflow.com/a/74844056
-
-    Usage:
-
-        opener = urllib.request.build_opener(NonRaisingUrllibErrorProcessor)
-        with opener.open(req) as resp:
-            ...
-    """
-
-    def http_response(self, request, response):
-        return response
-
-    def https_response(self, request, response):
-        return response
-
-
-########################################
-# ../../../omlish/http/versions.py
-
-
-##
-
-
-class UnknownHttpVersionError(Exception):
-    pass
-
-
-@ta.final
-@functools.total_ordering
-class HttpVersion:
-    def __init__(self, major: int, minor: int) -> None:
-        self._major = major
-        self._minor = minor
-
-        self._parts = parts = (major, minor)
-
-        self._hash = hash(parts)
-
-        self._str = f'HTTP/{major}.{minor}'
-        self._short_str = f'{major}.{minor}'
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self.major}, {self.minor})'
-
-    def __hash__(self) -> int:
-        return self._hash
-
-    def __eq__(self, other: object) -> ta.Any:
-        if not isinstance(other, HttpVersion):
-            return NotImplemented
-        return self._parts == other._parts
-
-    def __lt__(self, other: object) -> ta.Any:
-        if not isinstance(other, HttpVersion):
-            return NotImplemented
-        return self._parts < other._parts
-
-    @property
-    def major(self) -> int:
-        return self._major
-
-    @property
-    def minor(self) -> int:
-        return self._minor
-
-    def __str__(self) -> str:
-        return self._str
-
-    @property
-    def short_str(self) -> str:
-        return self._short_str
-
-    def __iter__(self) -> ta.Iterator[int]:
-        return iter(self._parts)
-
-
-@ta.final
-class HttpVersions:
-    def __new__(cls, *args, **kwargs):  # noqa
-        raise TypeError
-
-    HTTP_0_9 = HttpVersion(0, 9)
-    HTTP_1_0 = HttpVersion(1, 0)
-    HTTP_1_1 = HttpVersion(1, 1)
-    HTTP_2_0 = HttpVersion(2, 0)
-
-    _FROM_STR: ta.ClassVar[ta.Mapping[str, HttpVersion]] = {
-        str(v): v for v in [
-            HTTP_0_9,
-            HTTP_1_0,
-            HTTP_1_1,
-            HTTP_2_0,
-        ]
-    }
-
-    @classmethod
-    def from_str(cls, s: str) -> HttpVersion:
-        try:
-            return cls._FROM_STR[s]
-        except KeyError:
-            raise UnknownHttpVersionError(s) from None
-
-    @classmethod
-    def of(cls, o: ta.Union[HttpVersion, str]) -> HttpVersion:
-        if isinstance(o, HttpVersion):
-            return o
-        elif isinstance(o, str):
-            return cls.from_str(o)
-        else:
-            raise TypeError(o)
-
-
-########################################
-# ../../../omlish/io/pushback.py
+# ../../../omlish/http/coro/_pushback.py
 
 
 ##
@@ -864,6 +776,127 @@ class PushbackReader:
             buf += chunk
 
 
+########################################
+# ../../../omlish/http/urllib.py
+
+
+##
+
+
+class NonRaisingUrllibErrorProcessor(urllib.request.HTTPErrorProcessor):
+    """
+    https://stackoverflow.com/a/74844056
+
+    Usage:
+
+        opener = urllib.request.build_opener(NonRaisingUrllibErrorProcessor)
+        with opener.open(req) as resp:
+            ...
+    """
+
+    def http_response(self, request, response):
+        return response
+
+    def https_response(self, request, response):
+        return response
+
+
+########################################
+# ../../../omlish/http/versions.py
+
+
+##
+
+
+class UnknownHttpVersionError(Exception):
+    pass
+
+
+@ta.final
+@functools.total_ordering
+class HttpVersion:
+    def __init__(self, major: int, minor: int) -> None:
+        self._major = major
+        self._minor = minor
+
+        self._parts = parts = (major, minor)
+
+        self._hash = hash(parts)
+
+        self._str = f'HTTP/{major}.{minor}'
+        self._short_str = f'{major}.{minor}'
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.major}, {self.minor})'
+
+    def __hash__(self) -> int:
+        return self._hash
+
+    def __eq__(self, other: object) -> ta.Any:
+        if not isinstance(other, HttpVersion):
+            return NotImplemented
+        return self._parts == other._parts
+
+    def __lt__(self, other: object) -> ta.Any:
+        if not isinstance(other, HttpVersion):
+            return NotImplemented
+        return self._parts < other._parts
+
+    @property
+    def major(self) -> int:
+        return self._major
+
+    @property
+    def minor(self) -> int:
+        return self._minor
+
+    def __str__(self) -> str:
+        return self._str
+
+    @property
+    def short_str(self) -> str:
+        return self._short_str
+
+    def __iter__(self) -> ta.Iterator[int]:
+        return iter(self._parts)
+
+
+@ta.final
+class HttpVersions:
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+    HTTP_0_9 = HttpVersion(0, 9)
+    HTTP_1_0 = HttpVersion(1, 0)
+    HTTP_1_1 = HttpVersion(1, 1)
+    HTTP_2_0 = HttpVersion(2, 0)
+
+    _FROM_STR: ta.ClassVar[ta.Mapping[str, HttpVersion]] = {
+        str(v): v for v in [
+            HTTP_0_9,
+            HTTP_1_0,
+            HTTP_1_1,
+            HTTP_2_0,
+        ]
+    }
+
+    @classmethod
+    def from_str(cls, s: str) -> HttpVersion:
+        try:
+            return cls._FROM_STR[s]
+        except KeyError:
+            raise UnknownHttpVersionError(s) from None
+
+    @classmethod
+    def of(cls, o: ta.Union[HttpVersion, str]) -> HttpVersion:
+        if isinstance(o, HttpVersion):
+            return o
+        elif isinstance(o, str):
+            return cls.from_str(o)
+        else:
+            raise TypeError(o)
+
+
 ########################################
 # ../../../omlish/lite/abstract.py
 

{omdev-0.0.0.dev542 → omdev-0.0.0.dev544}/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))