omxtra 0.0.0.dev526__tar.gz → 0.0.0.dev527__tar.gz

{omxtra-0.0.0.dev526/omxtra.egg-info → omxtra-0.0.0.dev527}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omxtra
-Version: 0.0.0.dev526
+Version: 0.0.0.dev527
 Summary: omxtra
 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.dev526
+Requires-Dist: omlish==0.0.0.dev527
 Dynamic: license-file
 
 # Overview

omxtra-0.0.0.dev527/omxtra/io/pipelines/bytes/buffering.py

@@ -0,0 +1,19 @@
+# ruff: noqa: UP045
+# @omlish-lite
+import abc
+import typing as ta
+
+from omlish.lite.abstract import Abstract
+
+from ..core import ChannelPipelineHandler
+
+
+##
+
+
+class InboundBytesBufferingChannelPipelineHandler(ChannelPipelineHandler, Abstract):
+    @abc.abstractmethod
+    def inbound_buffered_bytes(self) -> ta.Optional[int]:
+        """Returning `None` denotes currently unknown/unanswerable."""
+
+        raise NotImplementedError

{omxtra-0.0.0.dev526/omxtra/io/pipelines/handlers → omxtra-0.0.0.dev527/omxtra/io/pipelines/bytes}/decoders.py

@@ -7,11 +7,11 @@ from omlish.io.streams.scanning import ScanningByteStreamBuffer
 from omlish.io.streams.segmented import SegmentedByteStreamBuffer
 from omlish.io.streams.utils import ByteStreamBuffers
 
-from ..bytes import InboundBytesBufferingChannelPipelineHandler
 from ..core import ChannelPipelineHandler
 from ..core import ChannelPipelineHandlerContext
 from ..core import ChannelPipelineMessages
 from ..errors import IncompleteDecodingChannelPipelineError
+from .buffering import InboundBytesBufferingChannelPipelineHandler
 
 
 ##

omxtra-0.0.0.dev527/omxtra/io/pipelines/bytes/queues.py

@@ -0,0 +1,56 @@
+# ruff: noqa: FURB188 UP045
+# @omlish-lite
+import typing as ta
+
+from omlish.io.streams.utils import ByteStreamBuffers
+
+from ..handlers.fns import ChannelPipelineHandlerFn
+from ..handlers.fns import ChannelPipelineHandlerFns
+from ..handlers.queues import InboundQueueChannelPipelineHandler
+from .buffering import InboundBytesBufferingChannelPipelineHandler
+
+
+##
+
+
+class InboundBytesBufferingQueueChannelPipelineHandler(
+    InboundBytesBufferingChannelPipelineHandler,
+    InboundQueueChannelPipelineHandler,
+):
+    def __init__(
+            self,
+            *,
+            filter: ta.Union[ChannelPipelineHandlerFn[ta.Any, bool], ta.Literal[True], None] = None,  # noqa
+            passthrough: bool = False,
+    ) -> None:
+        if filter is True:
+            filter = ChannelPipelineHandlerFns.no_context(ByteStreamBuffers.can_bytes)  # noqa
+
+        super().__init__(
+            filter=filter,  # noqa
+            passthrough=passthrough,
+        )
+
+    _buffered_bytes: int = 0
+
+    # @ta.override
+    def inbound_buffered_bytes(self) -> ta.Optional[int]:
+        return self._buffered_bytes
+
+    # @ta.override
+    def _append(self, msg: ta.Any) -> None:
+        bl = ByteStreamBuffers.bytes_len(msg, True)
+
+        super()._append((msg, bl))
+
+        if bl is not None:
+            self._buffered_bytes += bl
+
+    # @ta.override
+    def _popleft(self) -> ta.Any:
+        msg, bl = self._q.popleft()
+
+        if bl is not None:
+            self._buffered_bytes -= bl
+
+        return msg

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev527}/omxtra/io/pipelines/core.py

@@ -16,14 +16,11 @@ from .errors import MessageReachedTerminalChannelPipelineError
 from .errors import SawEofChannelPipelineError
 
 
-F = ta.TypeVar('F')
 T = ta.TypeVar('T')
 
 ChannelPipelineHandlerT = ta.TypeVar('ChannelPipelineHandlerT', bound='ChannelPipelineHandler')
 ShareableChannelPipelineHandlerT = ta.TypeVar('ShareableChannelPipelineHandlerT', bound='ShareableChannelPipelineHandler')  # noqa
 
-ChannelPipelineHandlerFn = ta.Callable[['ChannelPipelineHandlerContext', F], T]  # ta.TypeAlias
-
 
 ##
 
@@ -80,41 +77,6 @@ class ChannelPipelineEvents(NamespaceClass):
 ##
 
 
-class ChannelPipelineHandlerFns(NamespaceClass):
-    @dc.dataclass(frozen=True)
-    class NoContext(ta.Generic[F, T]):
-        fn: ta.Callable[[F], T]
-
-        def __repr__(self) -> str:
-            return f'{type(self).__name__}({self.fn!r})'
-
-        def __call__(self, ctx: 'ChannelPipelineHandlerContext', obj: F) -> T:
-            return self.fn(obj)
-
-    @classmethod
-    def no_context(cls, fn: ta.Callable[[F], T]) -> ChannelPipelineHandlerFn[F, T]:
-        return cls.NoContext(fn=fn)
-
-    #
-
-    @dc.dataclass(frozen=True)
-    class Isinstance:
-        ty: ta.Union[type, ta.Tuple[type, ...]]
-
-        def __repr__(self) -> str:
-            return f'{type(self).__name__}({self.ty!r})'
-
-        def __call__(self, ctx: 'ChannelPipelineHandlerContext', msg: ta.Any) -> bool:
-            return isinstance(msg, self.ty)
-
-    @classmethod
-    def isinstance(cls, ty: ta.Union[type, ta.Tuple[type, ...]]) -> ChannelPipelineHandlerFn[ta.Any, bool]:
-        return cls.Isinstance(ty=ty)
-
-
-##
-
-
 @ta.final
 class ChannelPipelineHandlerRef(ta.Generic[T]):
     """

{omxtra-0.0.0.dev526/omxtra/io/pipelines → omxtra-0.0.0.dev527/omxtra/io/pipelines/drivers}/asyncio.py

@@ -6,8 +6,8 @@ import typing as ta
 from omlish.io.streams.utils import ByteStreamBuffers
 from omlish.lite.check import check
 
-from .bytes import BytesChannelPipelineFlowControl
-from .core import PipelineChannel
+from ..core import PipelineChannel
+from ..flow.bytes import BytesChannelPipelineFlowControl
 
 
 ##

{omxtra-0.0.0.dev526/omxtra/io/pipelines → omxtra-0.0.0.dev527/omxtra/io/pipelines/flow}/bytes.py

@@ -1,12 +1,10 @@
 # ruff: noqa: UP045
 # @omlish-lite
-import abc
 import typing as ta
 
 from omlish.io.streams.utils import ByteStreamBuffers
 from omlish.lite.abstract import Abstract
 
-from .core import ChannelPipelineHandler
 from .flow import ChannelPipelineFlowControl
 from .flow import ChannelPipelineFlowControlAdapter
 from .flow import FlowControlChannelPipelineHandler
@@ -15,20 +13,9 @@ from .flow import FlowControlChannelPipelineHandler
 ##
 
 
-class InboundBytesBufferingChannelPipelineHandler(ChannelPipelineHandler, Abstract):
-    @abc.abstractmethod
-    def inbound_buffered_bytes(self) -> ta.Optional[int]:
-        """Returning `None` denotes currently unknown/unanswerable."""
-
-        raise NotImplementedError
-
-
-##
-
-
 class BytesChannelPipelineFlowControlAdapter(ChannelPipelineFlowControlAdapter):
     def get_cost(self, msg: ta.Any) -> ta.Optional[int]:
-        return ByteStreamBuffers.bytes_len(msg)
+        return ByteStreamBuffers.bytes_len(msg, True)
 
 
 ##

{omxtra-0.0.0.dev526/omxtra/io/pipelines → omxtra-0.0.0.dev527/omxtra/io/pipelines/flow}/flow.py

@@ -9,12 +9,12 @@ from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.namespaces import NamespaceClass
 
-from .core import ChannelPipelineEvents
-from .core import ChannelPipelineHandler
-from .core import ChannelPipelineHandlerContext
-from .core import ChannelPipelineMessages
-from .core import PipelineChannel
-from .errors import FlowControlValidationChannelPipelineError
+from ..core import ChannelPipelineEvents
+from ..core import ChannelPipelineHandler
+from ..core import ChannelPipelineHandlerContext
+from ..core import ChannelPipelineMessages
+from ..core import PipelineChannel
+from ..errors import FlowControlValidationChannelPipelineError
 
 
 ##

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev527}/omxtra/io/pipelines/handlers/flatmap.py

@@ -11,7 +11,7 @@ from omlish.lite.namespaces import NamespaceClass
 from ..core import ChannelPipelineDirectionOrDuplex
 from ..core import ChannelPipelineHandler
 from ..core import ChannelPipelineHandlerContext
-from ..core import ChannelPipelineHandlerFn
+from .fns import ChannelPipelineHandlerFn
 
 
 ##

omxtra-0.0.0.dev527/omxtra/io/pipelines/handlers/fns.py

@@ -0,0 +1,120 @@
+# ruff: noqa: UP006 UP007 UP045
+# @omlish-lite
+import dataclasses as dc
+import typing as ta
+
+from omlish.lite.abstract import Abstract
+from omlish.lite.namespaces import NamespaceClass
+
+from ..core import ChannelPipelineHandler
+from ..core import ChannelPipelineHandlerContext
+
+
+F = ta.TypeVar('F')
+T = ta.TypeVar('T')
+
+ChannelPipelineHandlerFn = ta.Callable[['ChannelPipelineHandlerContext', F], T]  # ta.TypeAlias
+
+
+##
+
+
+class ChannelPipelineHandlerFns(NamespaceClass):
+    @dc.dataclass(frozen=True)
+    class NoContext(ta.Generic[F, T]):
+        fn: ta.Callable[[F], T]
+
+        def __repr__(self) -> str:
+            return f'{type(self).__name__}({self.fn!r})'
+
+        def __call__(self, ctx: ChannelPipelineHandlerContext, obj: F) -> T:
+            return self.fn(obj)
+
+    @classmethod
+    def no_context(cls, fn: ta.Callable[[F], T]) -> ChannelPipelineHandlerFn[F, T]:
+        return cls.NoContext(fn=fn)
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class Isinstance:
+        ty: ta.Union[type, ta.Tuple[type, ...]]
+
+        def __repr__(self) -> str:
+            return f'{type(self).__name__}({self.ty!r})'
+
+        def __call__(self, ctx: ChannelPipelineHandlerContext, msg: ta.Any) -> bool:
+            return isinstance(msg, self.ty)
+
+    @classmethod
+    def isinstance(cls, ty: ta.Union[type, ta.Tuple[type, ...]]) -> ChannelPipelineHandlerFn[ta.Any, bool]:
+        return cls.Isinstance(ty=ty)
+
+
+##
+
+
+class FnChannelPipelineHandler(ChannelPipelineHandler, Abstract):
+    @classmethod
+    def of(
+            cls,
+            *,
+            inbound: ta.Optional[ChannelPipelineHandlerFn[ta.Any, None]] = None,
+            outbound: ta.Optional[ChannelPipelineHandlerFn[ta.Any, None]] = None,
+    ) -> ChannelPipelineHandler:
+        if inbound is not None and outbound is not None:
+            return DuplexFnChannelPipelineHandler(inbound=inbound, outbound=outbound)
+        elif inbound is not None:
+            return InboundFnChannelPipelineHandler(inbound)
+        elif outbound is not None:
+            return OutboundFnChannelPipelineHandler(outbound)
+        else:
+            raise ValueError('At least one of inbound or outbound must be specified')
+
+
+class InboundFnChannelPipelineHandler(FnChannelPipelineHandler):
+    def __init__(self, inbound: ChannelPipelineHandlerFn[ta.Any, None]) -> None:
+        super().__init__()
+
+        self._inbound = inbound
+
+    def __repr__(self) -> str:
+        return f'{type(self).__name__}@{id(self):x}({self._inbound!r})'
+
+    def inbound(self, ctx: ChannelPipelineHandlerContext, msg: ta.Any) -> None:
+        self._inbound(ctx, msg)
+
+
+class OutboundFnChannelPipelineHandler(FnChannelPipelineHandler):
+    def __init__(self, outbound: ChannelPipelineHandlerFn[ta.Any, None]) -> None:
+        super().__init__()
+
+        self._outbound = outbound
+
+    def __repr__(self) -> str:
+        return f'{type(self).__name__}@{id(self):x}({self._outbound!r})'
+
+    def outbound(self, ctx: ChannelPipelineHandlerContext, msg: ta.Any) -> None:
+        self._outbound(ctx, msg)
+
+
+class DuplexFnChannelPipelineHandler(FnChannelPipelineHandler):
+    def __init__(
+            self,
+            *,
+            inbound: ChannelPipelineHandlerFn[ta.Any, None],
+            outbound: ChannelPipelineHandlerFn[ta.Any, None],
+    ) -> None:
+        super().__init__()
+
+        self._inbound = inbound
+        self._outbound = outbound
+
+    def __repr__(self) -> str:
+        return f'{type(self).__name__}@{id(self):x}(inbound={self._inbound!r}, outbound={self._outbound!r})'
+
+    def inbound(self, ctx: ChannelPipelineHandlerContext, msg: ta.Any) -> None:
+        self._inbound(ctx, msg)
+
+    def outbound(self, ctx: ChannelPipelineHandlerContext, msg: ta.Any) -> None:
+        self._outbound(ctx, msg)

omxtra-0.0.0.dev527/omxtra/io/pipelines/handlers/queues.py

@@ -0,0 +1,99 @@
+# ruff: noqa: UP006 UP037 UP045
+# @omlish-lite
+"""
+TODO:
+ - max size, simple backpressure?
+"""
+import collections
+import typing as ta
+
+from omlish.lite.abstract import Abstract
+
+from ..core import ChannelPipelineHandler
+from ..core import ChannelPipelineHandlerContext
+from .fns import ChannelPipelineHandlerFn
+
+
+##
+
+
+class QueueChannelPipelineHandler(ChannelPipelineHandler, Abstract):
+    def __init__(
+            self,
+            *,
+            filter: ta.Optional[ChannelPipelineHandlerFn[ta.Any, bool]] = None,  # noqa
+            passthrough: bool = False,
+    ) -> None:
+        super().__init__()
+
+        self._filter = filter
+        self._passthrough = passthrough
+
+        self._q: 'collections.deque[ta.Any]' = collections.deque()
+
+    def __repr__(self) -> str:
+        return ''.join([
+            f'{type(self).__name__}@{id(self):x}',
+            f'<len={len(self._q)}>',
+            '(',
+            ', '.join([
+                *([f'filter={self._filter!r}'] if self._filter is not None else []),
+                *([f'passthrough={self._passthrough!r}'] if self._passthrough else []),
+            ]),
+            ')',
+        ])
+
+    #
+
+    def _append(self, msg: ta.Any) -> None:
+        self._q.append(msg)
+
+    def _popleft(self) -> ta.Any:
+        return self._q.popleft()
+
+    #
+
+    def poll(self) -> ta.Optional[ta.Any]:
+        if not self._q:
+            return None
+
+        return self._popleft()
+
+    def drain(self) -> ta.List[ta.Any]:
+        out: ta.List[ta.Any] = []
+
+        while self._q:
+            out.append(self._popleft())
+
+        return out
+
+
+class InboundQueueChannelPipelineHandler(QueueChannelPipelineHandler):
+    def inbound(self, ctx: ChannelPipelineHandlerContext, msg: ta.Any) -> None:
+        if (self._filter is not None and not self._filter(ctx, msg)):
+            ctx.feed_in(msg)
+            return
+
+        self._append(msg)
+
+        if self._passthrough:
+            ctx.feed_in(msg)
+
+
+class OutboundQueueChannelPipelineHandler(QueueChannelPipelineHandler):
+    def outbound(self, ctx: ChannelPipelineHandlerContext, msg: ta.Any) -> None:
+        if (self._filter is not None and not self._filter(ctx, msg)):
+            ctx.feed_out(msg)
+            return
+
+        self._append(msg)
+
+        if self._passthrough:
+            ctx.feed_out(msg)
+
+
+class DuplexQueueChannelPipelineHandler(
+    InboundQueueChannelPipelineHandler,
+    OutboundQueueChannelPipelineHandler,
+):
+    pass

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev527}/omxtra/io/pipelines/http/client/responses.py

@@ -9,7 +9,7 @@ from omlish.http.parsing import ParsedHttpMessage
 from omlish.io.streams.utils import ByteStreamBuffers
 from omlish.lite.check import check
 
-from ...bytes import InboundBytesBufferingChannelPipelineHandler
+from ...bytes.buffering import InboundBytesBufferingChannelPipelineHandler
 from ...core import ChannelPipelineHandler
 from ...core import ChannelPipelineHandlerContext
 from ...core import ChannelPipelineMessages

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev527}/omxtra/io/pipelines/http/server/requests.py

@@ -10,7 +10,7 @@ from omlish.io.streams.segmented import SegmentedByteStreamBuffer
 from omlish.io.streams.utils import ByteStreamBuffers
 from omlish.lite.check import check
 
-from ...bytes import InboundBytesBufferingChannelPipelineHandler
+from ...bytes.buffering import InboundBytesBufferingChannelPipelineHandler
 from ...core import ChannelPipelineHandlerContext
 from ...core import ChannelPipelineMessages
 from ..decoders import ChunkedPipelineHttpContentChunkDecoder

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev527/omxtra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omxtra
-Version: 0.0.0.dev526
+Version: 0.0.0.dev527
 Summary: omxtra
 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.dev526
+Requires-Dist: omlish==0.0.0.dev527
 Dynamic: license-file
 
 # Overview

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev527}/omxtra.egg-info/SOURCES.txt

@@ -55,14 +55,21 @@ omxtra/formats/json5/_antlr/__init__.py
 omxtra/io/__init__.py
 omxtra/io/trampoline.py
 omxtra/io/pipelines/__init__.py
-omxtra/io/pipelines/asyncio.py
-omxtra/io/pipelines/bytes.py
 omxtra/io/pipelines/core.py
 omxtra/io/pipelines/errors.py
-omxtra/io/pipelines/flow.py
+omxtra/io/pipelines/bytes/__init__.py
+omxtra/io/pipelines/bytes/buffering.py
+omxtra/io/pipelines/bytes/decoders.py
+omxtra/io/pipelines/bytes/queues.py
+omxtra/io/pipelines/drivers/__init__.py
+omxtra/io/pipelines/drivers/asyncio.py
+omxtra/io/pipelines/flow/__init__.py
+omxtra/io/pipelines/flow/bytes.py
+omxtra/io/pipelines/flow/flow.py
 omxtra/io/pipelines/handlers/__init__.py
-omxtra/io/pipelines/handlers/decoders.py
 omxtra/io/pipelines/handlers/flatmap.py
+omxtra/io/pipelines/handlers/fns.py
+omxtra/io/pipelines/handlers/queues.py
 omxtra/io/pipelines/http/__init__.py
 omxtra/io/pipelines/http/decoders.py
 omxtra/io/pipelines/http/requests.py

omxtra-0.0.0.dev527/omxtra.egg-info/requires.txt

@@ -0,0 +1 @@
+omlish==0.0.0.dev527

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev527}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev526'
+version = '0.0.0.dev527'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omxtra'
 dependencies = [
-    'omlish == 0.0.0.dev526',
+    'omlish == 0.0.0.dev527',
 ]
 
 [project.optional-dependencies]

omxtra-0.0.0.dev526/omxtra.egg-info/requires.txt

@@ -1 +0,0 @@
-omlish==0.0.0.dev526