ominfra 0.0.0.dev276__py3-none-any.whl → 0.0.0.dev277__py3-none-any.whl

ominfra/scripts/journald2aws.py

@@ -2807,9 +2807,16 @@ DEFAULT_CONFIG_RENDERER = SwitchedConfigRenderer(DEFAULT_CONFIG_RENDERERS)
 # ../../../../../omlish/io/buffers.py
 
 
+##
+
+
 class DelimitingBuffer:
     """
     https://github.com/python-trio/trio/issues/796 :|
+
+    FIXME: when given overlapping delimiters like [b'\r', b'\r\n'], *should* refuse to output a line ending in '\r'
+      without knowing it will not be followed by '\n'. does not currently do this - currently only picks longest
+      delimiter present in the buffer. does this need a prefix-trie? is this borderline parsing?
     """
 
     #
@@ -2831,19 +2838,37 @@ class DelimitingBuffer:
 
     def __init__(
             self,
-            delimiters: ta.Iterable[int] = DEFAULT_DELIMITERS,
+            delimiters: ta.Iterable[ta.Union[int, bytes]] = DEFAULT_DELIMITERS,
             *,
             keep_ends: bool = False,
             max_size: ta.Optional[int] = None,
     ) -> None:
         super().__init__()
 
-        self._delimiters = frozenset(check.isinstance(d, int) for d in delimiters)
+        ds: ta.Set[bytes] = set()
+        for d in delimiters:
+            if isinstance(d, int):
+                d = bytes([d])
+            ds.add(check.isinstance(d, bytes))
+
+        self._delimiters: ta.FrozenSet[bytes] = frozenset(ds)
         self._keep_ends = keep_ends
         self._max_size = max_size
 
         self._buf: ta.Optional[io.BytesIO] = io.BytesIO()
 
+        ddl = {}
+        dl = sorted(self._delimiters, key=lambda d: -len(d))
+        for i, d in enumerate(dl):
+            for j, d2 in enumerate(dl):
+                if len(d2) < len(d):
+                    break
+                if i == j or not d2.startswith(d):
+                    continue
+                ddl[d] = len(d2)
+                break
+        self._delimiter_disambiguation_lens: ta.Dict[bytes, int] = ddl
+
     #
 
     @property
@@ -2860,13 +2885,30 @@ class DelimitingBuffer:
             raise self.ClosedError(self)
         return buf.getvalue()
 
-    def _find_delim(self, data: ta.Union[bytes, bytearray], i: int) -> ta.Optional[int]:
-        r = None  # type: int | None
+    def _find_delim(self, data: ta.Union[bytes, bytearray], i: int) -> ta.Optional[ta.Tuple[int, int]]:
+        rp = None  # type: int | None
+        rl = None  # type: int | None
+        rd = None  # type: bytes | None
+
         for d in self._delimiters:
-            if (p := data.find(d, i)) >= 0:
-                if r is None or p < r:
-                    r = p
-        return r
+            if (p := data.find(d, i)) < 0:
+                continue
+
+            dl = len(d)
+
+            if rp is None or p < rp:
+                rp, rl, rd = p, dl, d
+            elif rp == p and rl < dl:  # type: ignore
+                rl, rd = dl, d  # noqa
+
+        if rp is None:
+            return None
+
+        # FIXME:
+        # if (ddl := self._delimiter_disambiguation_lens.get(rd)) is not None:
+        #     raise NotImplementedError
+
+        return rp, rl  # type: ignore
 
     def _append_and_reset(self, chunk: bytes) -> bytes:
         buf = check.not_none(self._buf)
@@ -2897,10 +2939,11 @@ class DelimitingBuffer:
         l = len(data)
         i = 0
         while i < l:
-            if (p := self._find_delim(data, i)) is None:
+            if (pt := self._find_delim(data, i)) is None:
                 break
 
-            n = p + 1
+            p, pl = pt
+            n = p + pl
             if self._keep_ends:
                 p = n
 
@@ -2928,6 +2971,9 @@ class DelimitingBuffer:
             i = p
 
 
+##
+
+
 class ReadableListBuffer:
     # FIXME: merge with PrependableGeneratorReader
 
@@ -2999,6 +3045,9 @@ class ReadableListBuffer:
         return r if isinstance(r, bytes) else None
 
 
+##
+
+
 class IncrementalWriteBuffer:
     def __init__(
             self,

ominfra/scripts/supervisor.py

@@ -4042,9 +4042,16 @@ class HttpRequestParser:
 # ../../../omlish/io/buffers.py
 
 
+##
+
+
 class DelimitingBuffer:
     """
     https://github.com/python-trio/trio/issues/796 :|
+
+    FIXME: when given overlapping delimiters like [b'\r', b'\r\n'], *should* refuse to output a line ending in '\r'
+      without knowing it will not be followed by '\n'. does not currently do this - currently only picks longest
+      delimiter present in the buffer. does this need a prefix-trie? is this borderline parsing?
     """
 
     #
@@ -4066,19 +4073,37 @@ class DelimitingBuffer:
 
     def __init__(
             self,
-            delimiters: ta.Iterable[int] = DEFAULT_DELIMITERS,
+            delimiters: ta.Iterable[ta.Union[int, bytes]] = DEFAULT_DELIMITERS,
             *,
             keep_ends: bool = False,
             max_size: ta.Optional[int] = None,
     ) -> None:
         super().__init__()
 
-        self._delimiters = frozenset(check.isinstance(d, int) for d in delimiters)
+        ds: ta.Set[bytes] = set()
+        for d in delimiters:
+            if isinstance(d, int):
+                d = bytes([d])
+            ds.add(check.isinstance(d, bytes))
+
+        self._delimiters: ta.FrozenSet[bytes] = frozenset(ds)
         self._keep_ends = keep_ends
         self._max_size = max_size
 
         self._buf: ta.Optional[io.BytesIO] = io.BytesIO()
 
+        ddl = {}
+        dl = sorted(self._delimiters, key=lambda d: -len(d))
+        for i, d in enumerate(dl):
+            for j, d2 in enumerate(dl):
+                if len(d2) < len(d):
+                    break
+                if i == j or not d2.startswith(d):
+                    continue
+                ddl[d] = len(d2)
+                break
+        self._delimiter_disambiguation_lens: ta.Dict[bytes, int] = ddl
+
     #
 
     @property
@@ -4095,13 +4120,30 @@ class DelimitingBuffer:
             raise self.ClosedError(self)
         return buf.getvalue()
 
-    def _find_delim(self, data: ta.Union[bytes, bytearray], i: int) -> ta.Optional[int]:
-        r = None  # type: int | None
+    def _find_delim(self, data: ta.Union[bytes, bytearray], i: int) -> ta.Optional[ta.Tuple[int, int]]:
+        rp = None  # type: int | None
+        rl = None  # type: int | None
+        rd = None  # type: bytes | None
+
         for d in self._delimiters:
-            if (p := data.find(d, i)) >= 0:
-                if r is None or p < r:
-                    r = p
-        return r
+            if (p := data.find(d, i)) < 0:
+                continue
+
+            dl = len(d)
+
+            if rp is None or p < rp:
+                rp, rl, rd = p, dl, d
+            elif rp == p and rl < dl:  # type: ignore
+                rl, rd = dl, d  # noqa
+
+        if rp is None:
+            return None
+
+        # FIXME:
+        # if (ddl := self._delimiter_disambiguation_lens.get(rd)) is not None:
+        #     raise NotImplementedError
+
+        return rp, rl  # type: ignore
 
     def _append_and_reset(self, chunk: bytes) -> bytes:
         buf = check.not_none(self._buf)
@@ -4132,10 +4174,11 @@ class DelimitingBuffer:
         l = len(data)
         i = 0
         while i < l:
-            if (p := self._find_delim(data, i)) is None:
+            if (pt := self._find_delim(data, i)) is None:
                 break
 
-            n = p + 1
+            p, pl = pt
+            n = p + pl
             if self._keep_ends:
                 p = n
 
@@ -4163,6 +4206,9 @@ class DelimitingBuffer:
             i = p
 
 
+##
+
+
 class ReadableListBuffer:
     # FIXME: merge with PrependableGeneratorReader
 
@@ -4234,6 +4280,9 @@ class ReadableListBuffer:
         return r if isinstance(r, bytes) else None
 
 
+##
+
+
 class IncrementalWriteBuffer:
     def __init__(
             self,

{ominfra-0.0.0.dev276.dist-info → ominfra-0.0.0.dev277.dist-info}/METADATA

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

{ominfra-0.0.0.dev276.dist-info → ominfra-0.0.0.dev277.dist-info}/RECORD

@@ -112,9 +112,9 @@ 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=e-h-YSCQdrbHwpyVkrQuFMNyEGOesX-rmJauXP-5Skg,169752
+ominfra/scripts/journald2aws.py,sha256=IgF4hmmjQv_bVEETNci4k6mtGRWuiGeW90mvWl14BAI,171170
 ominfra/scripts/manage.py,sha256=OlfubrtGmXWAyUOO6eHOj-k4XmfDPrngdKTLlm6yLZA,380865
-ominfra/scripts/supervisor.py,sha256=5r6YXcRZUQs4FaL5-faCqnicgsXEISYGQostaGKiBaQ,298330
+ominfra/scripts/supervisor.py,sha256=9fEgMFPZMRGk7uBVdywzR_E5Y6_xTxUw3zUs_SCu17o,299748
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -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.dev276.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev276.dist-info/METADATA,sha256=2JmrHLRyxgZ5yEgwibGziwnvsl8PxirK8snf__xmirA,753
-ominfra-0.0.0.dev276.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ominfra-0.0.0.dev276.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev276.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev276.dist-info/RECORD,,
+ominfra-0.0.0.dev277.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev277.dist-info/METADATA,sha256=7UxDcwMoM-Rl1B4e9hjXwMXl7sETavE3HwRwSnwZJa0,753
+ominfra-0.0.0.dev277.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ominfra-0.0.0.dev277.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev277.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev277.dist-info/RECORD,,